diff --git a/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php b/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php
index 4d4d0ba5..4f68c705 100644
--- a/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php
+++ b/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php
@@ -47,6 +47,12 @@ public function suppressValidationOnSaveDraft(PostSubmitEvent $event)
                 $event->stopPropagation();
             }
         }
+
+        if ($form->has('saveDraftAndClose')) {
+            if ($form->get('saveDraftAndClose')->isClicked()) {
+                $event->stopPropagation();
+            }
+        }
     }
 
     public function suppressValidationOnAutosaveDraft(PostSubmitEvent $event)