diff --git a/src/Helper/Helper_Field_Container_Gf25.php b/src/Helper/Helper_Field_Container_Gf25.php
index 6cf3cb8d9..f4cab10d6 100644
--- a/src/Helper/Helper_Field_Container_Gf25.php
+++ b/src/Helper/Helper_Field_Container_Gf25.php
@@ -74,7 +74,7 @@ public function generate( GF_Field $field ) {
 			}
 
 			$gform = \GPDFAPI::get_form_class();
-			$form  = $gform->get_form( $field->form_id );
+			$form  = $gform->get_form( $field->formId );
 
 			if ( isset( $form['fields'] ) && ! empty( \GFFormDisplay::get_row_spacer( $field, $form ) ) ) {
 				$this->end_of_row = true;
diff --git a/tests/phpunit/integration/Helper/Test_Helper_Field_Container_Gf25.php b/tests/phpunit/integration/Helper/Test_Helper_Field_Container_Gf25.php
index 50d5e487b..e26319747 100644
--- a/tests/phpunit/integration/Helper/Test_Helper_Field_Container_Gf25.php
+++ b/tests/phpunit/integration/Helper/Test_Helper_Field_Container_Gf25.php
@@ -76,4 +76,26 @@ public function test_css_grid_insertion() {
 
 		ob_end_clean();
 	}
+
+	public function test_spacer_ends_the_row() {
+		$form_id = $this->gf_factory()->form->create(
+			[],
+			[
+				'title'         => 'Spacer',
+				'markupVersion' => 2,
+				'fields'        => [
+					[ 'id' => 1, 'type' => 'text', 'layoutGroupId' => 'a', 'layoutGridColumnSpan' => 4, 'layoutSpacerGridColumnSpan' => 8 ],
+					[ 'id' => 2, 'type' => 'text', 'layoutGroupId' => 'b', 'layoutGridColumnSpan' => 4 ],
+				],
+			]
+		);
+
+		ob_start();
+		foreach ( \GFAPI::get_form( $form_id )['fields'] as $field ) {
+			$this->class->generate( $field );
+		}
+		$this->class->close();
+
+		$this->assertSame( 2, substr_count( ob_get_clean(), 'row-separator' ) );
+	}
 }