diff --git a/src/Tests/WebformAlterHooksTest.php b/src/Tests/WebformAlterHooksTest.php
index 1bde090c..2ef6855b 100644
--- a/src/Tests/WebformAlterHooksTest.php
+++ b/src/Tests/WebformAlterHooksTest.php
@@ -39,9 +39,9 @@ class WebformAlterHooksTest extends WebformNodeTestBase {
     $webform_node = $this->createWebformNode('contact');
     $nid = $webform_node->id();
     $this->drupalGet("node/$nid");
-    $this->assertRaw("hook_form_alter(): 'webform_submission_contact_node_{$nid}_add_form' executed.");
-    $this->assertRaw("hook_form_webform_submission_form_alter(): 'webform_submission_contact_node_{$nid}_add_form' executed.");
-    $this->assertRaw("hook_form_webform_submission_WEBFORM_ID_form_alter(): 'webform_submission_contact_node_{$nid}_add_form' executed.");
+    $this->assertRaw("hook_form_alter(): 'webform_submission_contact_add_form' executed.");
+    $this->assertRaw("hook_form_webform_submission_form_alter(): 'webform_submission_contact_add_form' executed.");
+    $this->assertRaw("hook_form_webform_submission_WEBFORM_ID_form_alter(): 'webform_submission_contact_add_form' executed.");
   }
 
 }
diff --git a/src/WebformSubmissionForm.php b/src/WebformSubmissionForm.php
index d718d6ab..5b604b5f 100644
--- a/src/WebformSubmissionForm.php
+++ b/src/WebformSubmissionForm.php
@@ -210,9 +210,6 @@ class WebformSubmissionForm extends ContentEntityForm {
     if ($this->entity->getEntityType()->hasKey('bundle')) {
       $form_id .= '_' . $this->entity->bundle();
     }
-    if ($source_entity = $this->entity->getSourceEntity()) {
-      $form_id .= '_' . $source_entity->getEntityTypeId() . '_' . $source_entity->id();
-    }
     if ($this->operation != 'default') {
       $form_id .= '_' . $this->operation;
     }