diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 07e6b20706eab533db93a898ae69f8487a5168b9..f5058cfb59488fcfe4d1963387d7949630399880 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -172,7 +172,7 @@ abstract class AbstractBuildForm {
         $this->symbol[SYMBOL_DELETE] = "<span class='glyphicon " . GLYPH_ICON_DELETE . "'></span>";
 
         $this->ttContentUid = $this->store->getVar(TYPO3_TT_CONTENT_UID, STORE_TYPO3);
-        $this->formId = $this->formSpec[F_ID];
+        $this->formId = $this->formSpec[F_ID] ?? 0;
         $this->recordId = $this->store->getVar(CLIENT_RECORD_ID, STORE_SIP . STORE_RECORD . STORE_TYPO3 . STORE_ZERO);
 
     }
diff --git a/extension/Tests/Unit/Core/BuildFormPlainTest.php b/extension/Tests/Unit/Core/BuildFormPlainTest.php
index c9733c71eb9ff035a61f1418bf3ae3162307faf3..7d717bc9ae4c4c2ead08e41f642c76b9f7ccf4df 100644
--- a/extension/Tests/Unit/Core/BuildFormPlainTest.php
+++ b/extension/Tests/Unit/Core/BuildFormPlainTest.php
@@ -38,11 +38,11 @@ class BuildFormPlainTest extends AbstractDatabaseTest {
      */
     public function testGetFormId() {
         $build = new BuildFormPlain([F_DB_INDEX => DB_INDEX_DEFAULT], array(), array(), $this->dbArray);
-
-        $formId1 = $build->getFormId();
+        $formId = 0;
+        $formId1 = $build->getFormId($build->ttContentUid, $formId, $build->recordId);
         $this->assertMatchesRegularExpression('/qfq-form-[0-9]*-[0-9]*-[0-9]*/', $formId1);
 
-        $formId2 = $build->getFormId();
+        $formId2 = $build->getFormId($build->ttContentUid, $formId, $build->recordId);
         $this->assertEquals($formId1, $formId2);
 
         /*