diff --git a/src/WebformSubmissionForm.php b/src/WebformSubmissionForm.php
index cf73f8a6..fc42d6be 100644
--- a/src/WebformSubmissionForm.php
+++ b/src/WebformSubmissionForm.php
@@ -1080,15 +1080,15 @@ class WebformSubmissionForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   protected function actionsElement(array $form, FormStateInterface $form_state) {
-    // Custom webforms, which completely override the ContentEntityForm, should
-    // not return the actions element (aka submit buttons).
-    if (!empty($form['#custom_form'])) {
-      return NULL;
-    }
     $element = parent::actionsElement($form, $form_state);
     if (!empty($element)) {
       $element['#theme'] = 'webform_actions';
     }
+    // Custom webforms, which completely override the ContentEntityForm, should
+    // not display the actions element (aka submit buttons).
+    if (!empty($form['#custom_form'])) {
+      $element['#access'] = FALSE;
+    }
     return $element;
   }