diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
index 839640e9..6889ca02 100644
--- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
@@ -46,6 +46,11 @@ import {
   selectDistribution,
   selectImageTypes,
   selectRegistrationType,
+  selectHostname,
+  selectLanguages,
+  selectKeyboard,
+  selectTimezone,
+  selectNtpServers,
 } from '../../../../store/wizardSlice';
 import { useFlag } from '../../../../Utilities/useGetEnvironment';
 
@@ -60,6 +65,11 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
   const complianceProfile = useAppSelector(selectComplianceProfileID);
   const compliancePolicy = useAppSelector(selectCompliancePolicyID);
   const registrationType = useAppSelector(selectRegistrationType);
+  const hostname = useAppSelector(selectHostname);
+  const languages = useAppSelector(selectLanguages);
+  const keyboard = useAppSelector(selectKeyboard);
+  const timezone = useAppSelector(selectTimezone);
+  const ntpServers = useAppSelector(selectNtpServers);
 
   const [isExpandedImageOutput, setIsExpandedImageOutput] = useState(true);
   const [isExpandedTargetEnvs, setIsExpandedTargetEnvs] = useState(true);
@@ -334,41 +344,44 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
           <UsersList />
         </ExpandableSection>
       )}
-      {isTimezoneEnabled && (
-        <ExpandableSection
-          toggleContent={composeExpandable(
-            'Timezone',
-            'revisit-timezone',
-            'wizard-timezone'
-          )}
-          onToggle={(_event, isExpandedTimezone) =>
-            onToggleTimezone(isExpandedTimezone)
-          }
-          isExpanded={isExpandedTimezone}
-          isIndented
-          data-testid="timezone-expandable"
-        >
-          <TimezoneList />
-        </ExpandableSection>
-      )}
-      {isLocaleEnabled && (
-        <ExpandableSection
-          toggleContent={composeExpandable(
-            'Locale',
-            'revisit-locale',
-            'wizard-locale'
-          )}
-          onToggle={(_event, isExpandedLocale) =>
-            onToggleLocale(isExpandedLocale)
-          }
-          isExpanded={isExpandedLocale}
-          isIndented
-          data-testid="locale-expandable"
-        >
-          <LocaleList />
-        </ExpandableSection>
-      )}
-      {isHostnameEnabled && (
+      {isTimezoneEnabled &&
+        (timezone || (ntpServers && ntpServers.length > 0)) && (
+          <ExpandableSection
+            toggleContent={composeExpandable(
+              'Timezone',
+              'revisit-timezone',
+              'wizard-timezone'
+            )}
+            onToggle={(_event, isExpandedTimezone) =>
+              onToggleTimezone(isExpandedTimezone)
+            }
+            isExpanded={isExpandedTimezone}
+            isIndented
+            data-testid="timezone-expandable"
+          >
+            <TimezoneList />
+          </ExpandableSection>
+        )}
+      {isLocaleEnabled &&
+        ((languages && languages.length > 0) ||
+          (keyboard && keyboard.length > 0)) && (
+          <ExpandableSection
+            toggleContent={composeExpandable(
+              'Locale',
+              'revisit-locale',
+              'wizard-locale'
+            )}
+            onToggle={(_event, isExpandedLocale) =>
+              onToggleLocale(isExpandedLocale)
+            }
+            isExpanded={isExpandedLocale}
+            isIndented
+            data-testid="locale-expandable"
+          >
+            <LocaleList />
+          </ExpandableSection>
+        )}
+      {isHostnameEnabled && hostname && (
         <ExpandableSection
           toggleContent={composeExpandable(
             'Hostname',
diff --git a/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx b/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
index 4f252506..4ba604b2 100644
--- a/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
@@ -125,6 +125,7 @@ describe('Step Timezone', () => {
   test('revisit step button on Review works', async () => {
     await renderCreateMode();
     await goToTimezoneStep();
+    await selectTimezone();
     await goToReviewStep();
     await clickRevisitButton();
     await screen.findByRole('heading', { name: /Timezone/ });