diff --git a/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/accuracy-retention-interface.ts b/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/accuracy-retention-interface.ts
index 0ff9dcf50..625b7dacc 100644
--- a/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/accuracy-retention-interface.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/accuracy-retention-interface.ts
@@ -13,3 +13,7 @@ export interface IAccuracyCorrectionAndRetention {
     describeRetention: string;
   };
 }
+
+export interface AccuracyCorrectionAndRetentionProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/index.tsx b/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/index.tsx
index e66953511..d896591dd 100644
--- a/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/accuracyRetention/index.tsx
@@ -1,7 +1,10 @@
 import MDEditor from '@uiw/react-md-editor';
 import { useContext, useEffect, useMemo, useState } from 'react';
 import Messages from './helper/messages';
-import { IAccuracyCorrectionAndRetention } from './accuracy-retention-interface';
+import {
+  IAccuracyCorrectionAndRetention,
+  AccuracyCorrectionAndRetentionProps,
+} from './accuracy-retention-interface';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
 import { deepEqual } from '../../../../utils/object-comparison.util';
@@ -15,12 +18,8 @@ import ViewComments from '../../../common/ViewComment';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 import Radio from '../../../common/Radio';
 
-interface AccuracyCorrectionAndRetentionProps {
-  hideViewComments: boolean;
-}
-
 export const AccuracyCorrectionAndRetention = ({
-  hideViewComments,
+  showComments = true,
 }: AccuracyCorrectionAndRetentionProps) => {
   const {
     pia,
@@ -279,7 +278,7 @@ export const AccuracyCorrectionAndRetention = ({
                 </p>
               )}
             </div>
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
@@ -498,7 +497,7 @@ export const AccuracyCorrectionAndRetention = ({
                 </p>
               )}
             </div>
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
@@ -694,7 +693,7 @@ export const AccuracyCorrectionAndRetention = ({
                 </div>
               ) : null
             ) : null}
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
diff --git a/src/frontend/src/components/public/PIAFormTabs/additionalRisks/AdditionalRisks.ts b/src/frontend/src/components/public/PIAFormTabs/additionalRisks/AdditionalRisks.ts
index a241d70f7..6017e294b 100644
--- a/src/frontend/src/components/public/PIAFormTabs/additionalRisks/AdditionalRisks.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/additionalRisks/AdditionalRisks.ts
@@ -6,3 +6,7 @@ export interface IAdditionRisk extends Record<string, string> {
   risk: string;
   response: string;
 }
+
+export interface PIAAdditionalRisksProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/components/public/PIAFormTabs/additionalRisks/index.tsx b/src/frontend/src/components/public/PIAFormTabs/additionalRisks/index.tsx
index 0b00a2436..b02b7cd46 100644
--- a/src/frontend/src/components/public/PIAFormTabs/additionalRisks/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/additionalRisks/index.tsx
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useMemo, useState } from 'react';
 import Messages from './messages';
-import { IAdditionalRisks } from './AdditionalRisks';
+import { IAdditionalRisks, PIAAdditionalRisksProps } from './AdditionalRisks';
 import { deepEqual } from '../../../../utils/object-comparison.util';
 import { setNestedReactState } from '../../../../utils/object-modification.util';
 import { Table } from '../../../common/Table';
@@ -12,11 +12,9 @@ import {
 import ViewComments from '../../../common/ViewComment';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 
-interface PIAAdditionalRisksProps {
-  hideViewComments: boolean;
-}
-
-const PIAAdditionalRisks = ({ hideViewComments }: PIAAdditionalRisksProps) => {
+const PIAAdditionalRisks = ({
+  showComments = true,
+}: PIAAdditionalRisksProps) => {
   const {
     pia,
     commentCount,
@@ -84,7 +82,7 @@ const PIAAdditionalRisks = ({ hideViewComments }: PIAAdditionalRisksProps) => {
           format="row"
           readOnly={isReadOnly}
         />
-        {!hideViewComments && (
+        {showComments && (
           <ViewComments
             count={commentCount?.[PiaSections.ADDITIONAL_RISKS_RISKS]}
             path={PiaSections.ADDITIONAL_RISKS_RISKS}
diff --git a/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/AgreementsAndInformationBanks.ts b/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/AgreementsAndInformationBanks.ts
index 66173d1fb..327acddd9 100644
--- a/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/AgreementsAndInformationBanks.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/AgreementsAndInformationBanks.ts
@@ -23,3 +23,7 @@ export interface IAgreementsAndInformationBanks {
 export interface ITextInputProps {
   pia: IPiaForm;
 }
+
+export interface PIAAgreementsAndInformationBanksProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/index.tsx b/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/index.tsx
index d84f9a1b9..afa1176b4 100644
--- a/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/agreementsAndInformationBanks/index.tsx
@@ -2,7 +2,10 @@ import { useContext, useEffect, useMemo, useState } from 'react';
 import Messages from './messages';
 import InputText from '../../../common/InputText/InputText';
 import MDEditor from '@uiw/react-md-editor';
-import { IAgreementsAndInformationBanks } from './AgreementsAndInformationBanks';
+import {
+  IAgreementsAndInformationBanks,
+  PIAAgreementsAndInformationBanksProps,
+} from './AgreementsAndInformationBanks';
 import CustomInputDate from '../../../common/CustomInputDate';
 import { dateToString, stringToDate } from '../../../../utils/date';
 import { deepEqual } from '../../../../utils/object-comparison.util';
@@ -18,12 +21,8 @@ import ViewComments from '../../../common/ViewComment';
 import Radio from '../../../common/Radio';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 
-interface PIAAgreementsAndInformationBanksProps {
-  hideViewComments: boolean;
-}
-
 const PIAAgreementsAndInformationBanks = ({
-  hideViewComments,
+  showComments = true,
 }: PIAAgreementsAndInformationBanksProps) => {
   const {
     pia,
@@ -372,7 +371,7 @@ const PIAAgreementsAndInformationBanks = ({
               </div>
             )}
           </div>
-          {!hideViewComments && (
+          {showComments && (
             <ViewComments
               count={
                 commentCount?.[
@@ -560,7 +559,7 @@ const PIAAgreementsAndInformationBanks = ({
               )}
             </div>
           </div>
-          {!hideViewComments && (
+          {showComments && (
             <ViewComments
               count={
                 commentCount?.[
diff --git a/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/CollectionUseAndDisclosure.ts b/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/CollectionUseAndDisclosure.ts
index 3495e2bb2..d3c9a72dd 100644
--- a/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/CollectionUseAndDisclosure.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/CollectionUseAndDisclosure.ts
@@ -14,3 +14,7 @@ export interface CollectionNoticeInput {
   drafterInput?: string;
   mpoInput?: string;
 }
+
+export interface PIACollectionUseAndDisclosureProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/index.tsx b/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/index.tsx
index 575a3a998..310bdca0f 100644
--- a/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/collectionUseAndDisclosure/index.tsx
@@ -3,7 +3,10 @@ import Messages from './messages';
 import MDEditor from '@uiw/react-md-editor';
 import { isMPORole } from '../../../../utils/helper.util';
 
-import { ICollectionUseAndDisclosure } from './CollectionUseAndDisclosure';
+import {
+  ICollectionUseAndDisclosure,
+  PIACollectionUseAndDisclosureProps,
+} from './CollectionUseAndDisclosure';
 import { deepEqual } from '../../../../utils/object-comparison.util';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
@@ -18,13 +21,8 @@ import ViewComments from '../../../common/ViewComment';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 import { TextInputEnum } from '../../../../constant/constant';
 
-// Define the prop type for hideViewComments
-interface PIACollectionUseAndDisclosureProps {
-  hideViewComments: boolean;
-}
-
 const PIACollectionUseAndDisclosure = ({
-  hideViewComments,
+  showComments = true,
 }: PIACollectionUseAndDisclosureProps) => {
   const {
     pia,
@@ -121,7 +119,7 @@ const PIACollectionUseAndDisclosure = ({
           addRowBtnLabel="Add more steps"
           format="row"
         />
-        {!hideViewComments && (
+        {showComments && (
           <ViewComments
             count={
               commentCount?.[PiaSections.COLLECTION_USE_AND_DISCLOSURE_STEPS]
@@ -245,7 +243,7 @@ const PIACollectionUseAndDisclosure = ({
             )}
           </div>
         </div>
-        {!hideViewComments && (
+        {showComments && (
           <ViewComments
             count={
               commentCount?.[
diff --git a/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/index.tsx b/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/index.tsx
index 594018cda..fca128044 100644
--- a/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/index.tsx
@@ -1,7 +1,10 @@
 import MDEditor from '@uiw/react-md-editor';
 import { useContext, useEffect, useMemo, useState } from 'react';
 import Messages from './helper/messages';
-import { ISecurityPersonalInformation } from './security-personal-info-interface';
+import {
+  ISecurityPersonalInformation,
+  SecurityPersonalInformationProps,
+} from './security-personal-info-interface';
 import Checkbox from '../../../common/Checkbox';
 import { deepEqual } from '../../../../utils/object-comparison.util';
 import { YesNoInput } from '../../../../types/enums/yes-no.enum';
@@ -16,12 +19,8 @@ import ViewComments from '../../../common/ViewComment';
 import Radio from '../../../common/Radio';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 
-interface SecurityPersonalInformationProps {
-  hideViewComments: boolean;
-}
-
 export const SecurityPersonalInformation = ({
-  hideViewComments,
+  showComments = true,
 }: SecurityPersonalInformationProps) => {
   const {
     pia,
@@ -337,7 +336,7 @@ export const SecurityPersonalInformation = ({
                 </p>
               )}
             </div>
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
@@ -435,7 +434,7 @@ export const SecurityPersonalInformation = ({
                   )}
                 </div>
               )}
-              {!hideViewComments && (
+              {showComments && (
                 <ViewComments
                   count={
                     commentCount?.[
@@ -582,7 +581,7 @@ export const SecurityPersonalInformation = ({
                 </p>
               )}
             </div>
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
diff --git a/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/security-personal-info-interface.ts b/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/security-personal-info-interface.ts
index 2b1fc3dd2..bd2da2dd2 100644
--- a/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/security-personal-info-interface.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/securityPersonalInformation/security-personal-info-interface.ts
@@ -16,3 +16,7 @@ export interface ISecurityPersonalInformation {
     additionalStrategies: string;
   };
 }
+
+export interface SecurityPersonalInformationProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/index.tsx b/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/index.tsx
index 6bab7d896..0ab9c44cd 100644
--- a/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/index.tsx
+++ b/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/index.tsx
@@ -4,7 +4,10 @@ import { YesNoInput } from '../../../../types/enums/yes-no.enum';
 import { isMPORole } from '../../../../utils/helper.util';
 import { deepEqual } from '../../../../utils/object-comparison.util';
 import Radio from '../../../common/Radio';
-import { IStoringPersonalInformation } from './interfaces';
+import {
+  IStoringPersonalInformation,
+  StoringPersonalInformationProps,
+} from './interfaces';
 import Messages from './messages';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
@@ -19,12 +22,8 @@ import ViewComments from '../../../common/ViewComment';
 import { PiaSections } from '../../../../types/enums/pia-sections.enum';
 import Callout from '../../../common/Callout';
 
-interface StoringPersonalInformationProps {
-  hideViewComments: boolean;
-}
-
 const StoringPersonalInformation = ({
-  hideViewComments,
+  showComments = true,
 }: StoringPersonalInformationProps) => {
   const {
     pia,
@@ -396,7 +395,7 @@ const StoringPersonalInformation = ({
               )}
             </div>
           )}
-          {!hideViewComments && (
+          {showComments && (
             <ViewComments
               count={
                 commentCount?.[
@@ -518,7 +517,7 @@ const StoringPersonalInformation = ({
                 )}
               </div>
             )}
-            {!hideViewComments && (
+            {showComments && (
               <ViewComments
                 count={
                   commentCount?.[
@@ -766,7 +765,7 @@ const StoringPersonalInformation = ({
                     </p>
                   )}
                 </div>
-                {!hideViewComments && (
+                {showComments && (
                   <ViewComments
                     count={
                       commentCount?.[
@@ -859,7 +858,7 @@ const StoringPersonalInformation = ({
                         <i>Not answered</i>
                       </p>
                     )}
-                    {!hideViewComments && (
+                    {showComments && (
                       <ViewComments
                         count={
                           commentCount?.[
@@ -923,7 +922,7 @@ const StoringPersonalInformation = ({
                     <i>Not answered</i>
                   </p>
                 )}
-                {!hideViewComments && (
+                {showComments && (
                   <ViewComments
                     count={
                       commentCount?.[
@@ -985,7 +984,7 @@ const StoringPersonalInformation = ({
                     <i>Not answered</i>
                   </p>
                 )}
-                {!hideViewComments && (
+                {showComments && (
                   <ViewComments
                     count={
                       commentCount?.[
@@ -1041,7 +1040,7 @@ const StoringPersonalInformation = ({
                     readOnly={isReadOnly}
                   />
                 </div>
-                {!hideViewComments && (
+                {showComments && (
                   <ViewComments
                     count={
                       commentCount?.[
diff --git a/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/interfaces.ts b/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/interfaces.ts
index 2d3082b34..a5ac66295 100644
--- a/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/interfaces.ts
+++ b/src/frontend/src/components/public/PIAFormTabs/storingPersonalInformation/interfaces.ts
@@ -46,3 +46,7 @@ export interface IStoringPersonalInformation {
     };
   };
 }
+
+export interface StoringPersonalInformationProps {
+  showComments?: boolean;
+}
diff --git a/src/frontend/src/pages/PiaFormPrintPreview/index.tsx b/src/frontend/src/pages/PiaFormPrintPreview/index.tsx
index 6b29781f0..e10c462bb 100644
--- a/src/frontend/src/pages/PiaFormPrintPreview/index.tsx
+++ b/src/frontend/src/pages/PiaFormPrintPreview/index.tsx
@@ -42,7 +42,7 @@ export const PiaFormPrintPreview = () => {
   const [pia, setPia] = useState<IPiaForm>();
 
   // Determine to hide ViewComments on PDF
-  const hideViewComments = true;
+  const showComments = false;
 
   useEffect(() => {
     const htmlTag = document.getElementsByTagName('HTML')[0];
@@ -102,32 +102,24 @@ export const PiaFormPrintPreview = () => {
             {pia?.hasAddedPiToDataElements !== false && (
               <>
                 <div className="pageBreak">
-                  <PIACollectionUseAndDisclosure
-                    hideViewComments={hideViewComments}
-                  />
+                  <PIACollectionUseAndDisclosure showComments={showComments} />
                 </div>
                 <div className="pageBreak">
-                  <StoringPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
+                  <StoringPersonalInformation showComments={showComments} />
                 </div>
                 <div className="pageBreak">
-                  <SecurityPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
+                  <SecurityPersonalInformation showComments={showComments} />
                 </div>
                 <div className="pageBreak">
-                  <AccuracyCorrectionAndRetention
-                    hideViewComments={hideViewComments}
-                  />
+                  <AccuracyCorrectionAndRetention showComments={showComments} />
                 </div>
                 <div className="pageBreak">
                   <PIAAgreementsAndInformationBanks
-                    hideViewComments={hideViewComments}
+                    showComments={showComments}
                   />
                 </div>
                 <div className="pageBreak">
-                  <PIAAdditionalRisks hideViewComments={hideViewComments} />
+                  <PIAAdditionalRisks showComments={showComments} />
                 </div>
                 <div className="pageBreak">
                   <PIAReview printPreview />
diff --git a/src/frontend/src/routes/router.tsx b/src/frontend/src/routes/router.tsx
index d5533b398..6359bb14e 100644
--- a/src/frontend/src/routes/router.tsx
+++ b/src/frontend/src/routes/router.tsx
@@ -38,7 +38,6 @@ export const ProtectedRoute = () => {
 
 const Router = () => {
   const isMPO = !!isMPORole();
-  const hideViewComments = false;
 
   // const comingSoonBanner = (
   //   <div className="container w-100">
@@ -92,125 +91,47 @@ const Router = () => {
 
             <Route path="collectionUseAndDisclosure">
               <Route index element={<Navigate relative="path" to="view" />} />
-              <Route
-                path="edit"
-                element={
-                  <PIACollectionUseAndDisclosure
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
-              <Route
-                path="view"
-                element={
-                  <PIACollectionUseAndDisclosure
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
+              <Route path="edit" element={<PIACollectionUseAndDisclosure />} />
+              <Route path="view" element={<PIACollectionUseAndDisclosure />} />
             </Route>
 
             <Route
               path="storingPersonalInformation"
-              element={
-                <StoringPersonalInformation
-                  hideViewComments={hideViewComments}
-                />
-              }
+              element={<StoringPersonalInformation />}
             >
               <Route index element={<Navigate relative="path" to="view" />} />
-              <Route
-                path="edit"
-                element={
-                  <StoringPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
-              <Route
-                path="view"
-                element={
-                  <StoringPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
+              <Route path="edit" element={<StoringPersonalInformation />} />
+              <Route path="view" element={<StoringPersonalInformation />} />
             </Route>
 
             <Route path="securityOfPersonalInformation">
               <Route index element={<Navigate relative="path" to="view" />} />
-              <Route
-                path="edit"
-                element={
-                  <SecurityPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
-              <Route
-                path="view"
-                element={
-                  <SecurityPersonalInformation
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
+              <Route path="edit" element={<SecurityPersonalInformation />} />
+              <Route path="view" element={<SecurityPersonalInformation />} />
             </Route>
 
             <Route path="accuracyCorrectionAndRetention">
               <Route index element={<Navigate relative="path" to="view" />} />
-              <Route
-                path="edit"
-                element={
-                  <AccuracyCorrectionAndRetention
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
-              <Route
-                path="view"
-                element={
-                  <AccuracyCorrectionAndRetention
-                    hideViewComments={hideViewComments}
-                  />
-                }
-              />
+              <Route path="edit" element={<AccuracyCorrectionAndRetention />} />
+              <Route path="view" element={<AccuracyCorrectionAndRetention />} />
             </Route>
 
             <Route path="agreementsAndInformationBanks">
               <Route index element={<Navigate relative="path" to="view" />} />
               <Route
                 path="edit"
-                element={
-                  <PIAAgreementsAndInformationBanks
-                    hideViewComments={hideViewComments}
-                  />
-                }
+                element={<PIAAgreementsAndInformationBanks />}
               />
               <Route
                 path="view"
-                element={
-                  <PIAAgreementsAndInformationBanks
-                    hideViewComments={hideViewComments}
-                  />
-                }
+                element={<PIAAgreementsAndInformationBanks />}
               />
             </Route>
 
             <Route path="additionalRisks">
               <Route index element={<Navigate relative="path" to="view" />} />
-              <Route
-                path="edit"
-                element={
-                  <PIAAdditionalRisks hideViewComments={hideViewComments} />
-                }
-              />
-              <Route
-                path="view"
-                element={
-                  <PIAAdditionalRisks hideViewComments={hideViewComments} />
-                }
-              />
+              <Route path="edit" element={<PIAAdditionalRisks />} />
+              <Route path="view" element={<PIAAdditionalRisks />} />
             </Route>
             <Route path="ppq">
               <Route index element={<Navigate relative="path" to="view" />} />