diff --git a/__fixtures__/testDataWithGroupsLayout.json b/__fixtures__/testDataWithGroupsLayout.json
new file mode 100644
index 0000000000..712b128abd
--- /dev/null
+++ b/__fixtures__/testDataWithGroupsLayout.json
@@ -0,0 +1,360 @@
+{
+  "titleEn": "show-hide-groups-test",
+  "titleFr": "[FR]show-hide-groups-test",
+  "introduction": {
+    "descriptionEn": "",
+    "descriptionFr": ""
+  },
+  "privacyPolicy": {
+    "descriptionEn": "Privacy statement",
+    "descriptionFr": "[FR]Privacy statement"
+  },
+  "confirmation": {
+    "descriptionEn": "Confirmation message",
+    "descriptionFr": "[FR]Confirmation message",
+    "referrerUrlEn": "",
+    "referrerUrlFr": ""
+  },
+  "layout": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  "elements": [
+    {
+      "id": 8,
+      "type": "radio",
+      "properties": {
+        "choices": [
+          {
+            "en": "A",
+            "fr": "[FR]A"
+          },
+          {
+            "en": "B",
+            "fr": "[FR]B"
+          }
+        ],
+        "titleEn": "P3-Q1",
+        "titleFr": "[FR]P3-Q1",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": []
+      }
+    },
+    {
+      "id": 9,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P3-Q1-A",
+        "titleFr": "[FR]P3-Q1-A",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "8.0"
+          }
+        ]
+      }
+    },
+    {
+      "id": 10,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P3-Q1-B",
+        "titleFr": "[FR]P3-Q1-B",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "8.1"
+          }
+        ]
+      }
+    },
+    {
+      "id": 5,
+      "type": "radio",
+      "properties": {
+        "choices": [
+          {
+            "en": "A",
+            "fr": "[FR]A"
+          },
+          {
+            "en": "B",
+            "fr": "[FR]B"
+          }
+        ],
+        "titleEn": "P2-Q1",
+        "titleFr": "[FR]P2-Q1",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": []
+      }
+    },
+    {
+      "id": 6,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P2-Q1-A",
+        "titleFr": "[FR]P2-Q1-A",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "5.0"
+          }
+        ]
+      }
+    },
+    {
+      "id": 7,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P2-Q1-B",
+        "titleFr": "[FR]P2-Q1-B",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "5.1"
+          }
+        ]
+      }
+    },
+    {
+      "id": 2,
+      "type": "radio",
+      "properties": {
+        "choices": [
+          {
+            "en": "A",
+            "fr": "[FR]A"
+          },
+          {
+            "en": "B",
+            "fr": "[FR]B"
+          }
+        ],
+        "titleEn": "P1-Q1",
+        "titleFr": "[FR]P1-Q1",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": []
+      }
+    },
+    {
+      "id": 3,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P1-Q1-A",
+        "titleFr": "[FR]P1-Q1-A",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "2.0"
+          }
+        ]
+      }
+    },
+    {
+      "id": 4,
+      "type": "textField",
+      "properties": {
+        "choices": [
+          {
+            "en": "",
+            "fr": ""
+          }
+        ],
+        "titleEn": "P1-Q1-B",
+        "titleFr": "[FR]P1-Q1-B",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": [
+          {
+            "choiceId": "2.1"
+          }
+        ]
+      }
+    },
+    {
+      "id": 1,
+      "type": "radio",
+      "properties": {
+        "choices": [
+          {
+            "en": "A",
+            "fr": "[FR]A"
+          },
+          {
+            "en": "B",
+            "fr": "[FR]B"
+          },
+          {
+            "en": "C",
+            "fr": "[FR]C"
+          }
+        ],
+        "titleEn": "Q1",
+        "titleFr": "[FR]Q1",
+        "validation": {
+          "required": false
+        },
+        "subElements": [],
+        "descriptionEn": "",
+        "descriptionFr": "",
+        "placeholderEn": "",
+        "placeholderFr": "",
+        "conditionalRules": []
+      }
+    }
+  ],
+  "groups": {
+    "start": {
+      "name": "Start",
+      "titleEn": "Beginning",
+      "titleFr": "Beginning",
+      "autoFlow": false,
+      "elements": ["1"],
+      "nextAction": [
+        {
+          "groupId": "84b36e7b-2c6c-40be-ad22-1abd24c38019",
+          "choiceId": "1.0"
+        },
+        {
+          "groupId": "6365ee9b-1caa-4a08-b53d-ecfc2a9dd08f",
+          "choiceId": "1.1"
+        },
+        {
+          "groupId": "1231e20c-080e-4119-9774-33d829f290da",
+          "choiceId": "1.2"
+        }
+      ]
+    },
+    "84b36e7b-2c6c-40be-ad22-1abd24c38019": {
+      "name": "P1",
+      "titleEn": "P1",
+      "titleFr": "[FR]P1",
+      "autoFlow": false,
+      "elements": ["2", "3", "4"],
+      "nextAction": "review"
+    },
+    "6365ee9b-1caa-4a08-b53d-ecfc2a9dd08f": {
+      "name": "P2",
+      "titleEn": "P2",
+      "titleFr": "[FR]P2",
+      "autoFlow": false,
+      "elements": ["5", "6", "7"],
+      "nextAction": "review"
+    },
+    "1231e20c-080e-4119-9774-33d829f290da": {
+      "name": "P3",
+      "titleEn": "P3",
+      "titleFr": "[FR]P3",
+      "autoFlow": true,
+      "elements": ["8", "9", "10"],
+      "nextAction": "review"
+    },
+    "review": {
+      "name": "Review",
+      "titleEn": "Review",
+      "titleFr": "Review",
+      "elements": [],
+      "nextAction": "end"
+    },
+    "end": {
+      "name": "End",
+      "titleEn": "End",
+      "titleFr": "End",
+      "elements": []
+    }
+  },
+  "groupsLayout": [
+    "84b36e7b-2c6c-40be-ad22-1abd24c38019",
+    "6365ee9b-1caa-4a08-b53d-ecfc2a9dd08f",
+    "1231e20c-080e-4119-9774-33d829f290da"
+  ]
+}
diff --git a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx
index f93f96b65f..0ec464b7a7 100644
--- a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx	
+++ b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx	
@@ -26,6 +26,7 @@ import { safeJSONParse } from "@lib/utils";
 import { ErrorSaving } from "@formBuilder/components/shared/ErrorSaving";
 import { toast } from "@formBuilder/components/shared";
 import { defaultForm } from "@lib/store/defaults";
+import { showReviewPage } from "@lib/utils/form-builder/showReviewPage";
 
 export const Preview = ({
   disableSubmit = true,
@@ -94,6 +95,8 @@ export const Preview = ({
 
   const hasHydrated = useRehydrate();
 
+  const isShowReviewPage = showReviewPage(formRecord.form);
+
   if (isPastClosingDate) {
     return (
       <div className="max-w-4xl">
@@ -205,7 +208,9 @@ export const Preview = ({
                             fallBack={() => {
                               return (
                                 <>
-                                  {allowGrouping && <BackButton language={language} />}
+                                  {allowGrouping && isShowReviewPage && (
+                                    <BackButton language={language} />
+                                  )}
                                   <Button
                                     type="submit"
                                     id="SubmitButton"
diff --git a/components/clientComponents/forms/Form/Form.tsx b/components/clientComponents/forms/Form/Form.tsx
index 53105bc365..0c1f58ba49 100644
--- a/components/clientComponents/forms/Form/Form.tsx
+++ b/components/clientComponents/forms/Form/Form.tsx
@@ -20,6 +20,7 @@ import { LockedSections } from "@formBuilder/components/shared/right-panel/treev
 import { BackButton } from "@formBuilder/[id]/preview/BackButton";
 import { Language } from "@lib/types/form-builder-types";
 import { BackButtonGroup } from "../BackButtonGroup/BackButtonGroup";
+import { showReviewPage } from "@lib/utils/form-builder/showReviewPage";
 
 interface SubmitButtonProps {
   numberOfRequiredQuestions: number;
@@ -149,6 +150,7 @@ const InnerForm: React.FC<InnerFormProps> = (props) => {
 
   const { currentGroup, groupsCheck, getGroupTitle } = useGCFormsContext();
   const isGroupsCheck = groupsCheck(props.allowGrouping);
+  const isShowReviewPage = showReviewPage(form);
   const showIntro = isGroupsCheck ? currentGroup === LockedSections.START : true;
 
   const { t } = useTranslation();
@@ -233,7 +235,7 @@ const InnerForm: React.FC<InnerFormProps> = (props) => {
             onSubmit={(e) => {
               e.preventDefault();
               // For groups enabled forms only allow submitting on the Review page
-              if (isGroupsCheck && currentGroup !== LockedSections.REVIEW) {
+              if (isGroupsCheck && isShowReviewPage && currentGroup !== LockedSections.REVIEW) {
                 return;
               }
               handleSubmit(e);
@@ -243,6 +245,7 @@ const InnerForm: React.FC<InnerFormProps> = (props) => {
             aria-live="polite"
           >
             {isGroupsCheck &&
+              isShowReviewPage &&
               currentGroup !== LockedSections.REVIEW &&
               currentGroup !== LockedSections.START && (
                 <h2 className="pb-8">{getGroupTitle(currentGroup, language as Language)}</h2>
@@ -258,21 +261,25 @@ const InnerForm: React.FC<InnerFormProps> = (props) => {
               </RichText>
             )}
 
-            {isGroupsCheck && currentGroup === LockedSections.REVIEW && (
+            {isGroupsCheck && isShowReviewPage && currentGroup === LockedSections.REVIEW && (
               <Review language={language as Language} />
             )}
 
             <div className="flex">
-              {isGroupsCheck && <BackButtonGroup language={language as Language} />}
+              {isGroupsCheck && isShowReviewPage && (
+                <BackButtonGroup language={language as Language} />
+              )}
               {props.renderSubmit ? (
                 props.renderSubmit({
                   validateForm: props.validateForm,
                   fallBack: () => {
                     return (
                       <div>
-                        {isGroupsCheck && currentGroup === LockedSections.REVIEW && (
-                          <BackButton language={language as Language} />
-                        )}
+                        {isGroupsCheck &&
+                          isShowReviewPage &&
+                          currentGroup === LockedSections.REVIEW && (
+                            <BackButton language={language as Language} />
+                          )}
                         <div className="inline-block">
                           <SubmitButton
                             numberOfRequiredQuestions={numberOfRequiredQuestions}
diff --git a/components/clientComponents/forms/NextButton/NextButton.tsx b/components/clientComponents/forms/NextButton/NextButton.tsx
index be21c22495..36361b7300 100644
--- a/components/clientComponents/forms/NextButton/NextButton.tsx
+++ b/components/clientComponents/forms/NextButton/NextButton.tsx
@@ -12,6 +12,7 @@ import { ArrowRightNav } from "@serverComponents/icons/ArrowRightNav";
 import { Language } from "@lib/types/form-builder-types";
 
 import { getLocalizedProperty } from "@lib/utils";
+import { showReviewPage } from "@lib/utils/form-builder/showReviewPage";
 
 export const NextButton = ({
   validateForm,
@@ -40,7 +41,8 @@ export const NextButton = ({
     !currentGroup ||
     currentGroup === LockedSections.REVIEW ||
     currentGroup === LockedSections.END ||
-    !hasNextAction(currentGroup)
+    !hasNextAction(currentGroup) ||
+    !showReviewPage(formRecord.form)
   ) {
     return fallBack ? fallBack() : <></>;
   }
diff --git a/lib/utils/form-builder/showReviewPage.ts b/lib/utils/form-builder/showReviewPage.ts
new file mode 100644
index 0000000000..edf42c2970
--- /dev/null
+++ b/lib/utils/form-builder/showReviewPage.ts
@@ -0,0 +1,7 @@
+import { FormProperties } from "@lib/types";
+import { formHasGroups } from "./formHasGroups";
+
+export function showReviewPage(form: FormProperties) {
+  if (!formHasGroups(form)) return false;
+  return Array.isArray(form.groupsLayout) && form.groupsLayout.length > 0;
+}
diff --git a/lib/vitests/formHasGroups.test.ts b/lib/vitests/formHasGroups.test.ts
index 8b02a59c3b..a1916cd278 100644
--- a/lib/vitests/formHasGroups.test.ts
+++ b/lib/vitests/formHasGroups.test.ts
@@ -1,6 +1,6 @@
 import { FormProperties } from "@lib/types";
 import { formHasGroups } from "@lib/utils/form-builder/formHasGroups";
-import validFormTemplate from "../../__fixtures__/testDataWithGroups.json";
+import validFormTemplate from "../../__fixtures__/testDataWithGroupsLayout.json";
 describe("formHasGroups function", () => {
   it("Has valid groups", () => {
     const form = validFormTemplate as FormProperties;
diff --git a/lib/vitests/showReviewPage.test.ts b/lib/vitests/showReviewPage.test.ts
new file mode 100644
index 0000000000..612476429e
--- /dev/null
+++ b/lib/vitests/showReviewPage.test.ts
@@ -0,0 +1,29 @@
+import { FormProperties } from "@lib/types";
+import { showReviewPage } from "@lib/utils/form-builder/showReviewPage";
+import form from "../../__fixtures__/testDataWithGroupsLayout.json";
+
+describe("showReviewPage function", () => {
+  it("Handles undefined", () => {
+    const form = undefined as unknown as FormProperties;
+    expect(showReviewPage(form)).toBe(false);
+  });
+
+  it("Handles null", () => {
+    const form = null as unknown as FormProperties;
+    expect(showReviewPage(form)).toBe(false);
+  });
+
+  it("Handles non array", () => {
+    const form = {} as FormProperties;
+    expect(showReviewPage(form)).toBe(false);
+  });
+
+  it("Handles form with empty groupsLayout", () => {
+    const emptyGroupsLayout = { groupsLayout: [] as string[] } as FormProperties;
+    expect(showReviewPage(emptyGroupsLayout)).toBe(false);
+  });
+
+  it("Handles form with Ids in groupsLayout", () => {
+    expect(showReviewPage(form as FormProperties)).toBe(true);
+  });
+});