diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js
index aacfdc209e..877edf28d8 100644
--- a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js
+++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js
@@ -451,18 +451,22 @@
     editForm.addEventListener(
         'submit',
         (event) => {
-            const fieldDefinitionsCount = doc.querySelectorAll('.ibexa-collapse--field-definition').length;
+            const { submitter } = event;
 
-            validateForm();
+            if (!submitter?.hasAttribute('formnovalidate')) {
+                const fieldDefinitionsCount = doc.querySelectorAll('.ibexa-collapse--field-definition').length;
 
-            if (isEditFormValid) {
-                if (!fieldDefinitionsCount) {
+                validateForm();
+
+                if (isEditFormValid) {
+                    if (!fieldDefinitionsCount) {
+                        event.preventDefault();
+                        ibexa.helpers.notification.showErrorNotification(noFieldsAddedError);
+                    }
+                } else {
                     event.preventDefault();
-                    ibexa.helpers.notification.showErrorNotification(noFieldsAddedError);
+                    scrollToInvalidInput();
                 }
-            } else {
-                event.preventDefault();
-                scrollToInvalidInput();
             }
         },
         false,
diff --git a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig
index 311783b83d..bbe1f73054 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig
@@ -96,8 +96,14 @@
                 </div>
             </div>
 
-            {{ form_widget(form.publishContentType, { attr: { class: 'ibexa-content-type-edit__publish-content-type', hidden: 'hidden' }}) }}
-            {{ form_widget(form.removeDraft, {'attr': { 'hidden': 'hidden' }}) }}
+            {{ form_widget(form.publishContentType, { attr: {
+                class: 'ibexa-content-type-edit__publish-content-type',
+                hidden: 'hidden'
+            }}) }}
+            {{ form_widget(form.removeDraft, { attr: {
+                hidden: 'hidden',
+                formnovalidate: true,
+            }}) }}
 
             {{ form_widget(form._token) }}
         {{ form_end(form, {'render_rest': false }) }}