diff --git a/src/pages/MyMove/Home/MoveHome.jsx b/src/pages/MyMove/Home/MoveHome.jsx
index a99d0c60576..69859b1974b 100644
--- a/src/pages/MyMove/Home/MoveHome.jsx
+++ b/src/pages/MyMove/Home/MoveHome.jsx
@@ -168,8 +168,8 @@ const MoveHome = ({ serviceMemberMoves, isProfileComplete, serviceMember, signed
   };
 
   // checking if there are any incomplete shipment
-  const hasCompletedAllShipment = () => {
-    if (!mtoShipments || !mtoShipments?.length) return false;
+  const hasIncompleteShipment = () => {
+    if (!mtoShipments) return false;
     const shipmentValidators = {
       [SHIPMENT_TYPES.PPM]: isPPMShipmentComplete,
       [SHIPMENT_TYPES.BOAT_HAUL_AWAY]: isBoatShipmentComplete,
@@ -179,7 +179,7 @@ const MoveHome = ({ serviceMemberMoves, isProfileComplete, serviceMember, signed
 
     return mtoShipments.some((shipment) => {
       const validateShipment = shipmentValidators[shipment.shipmentType];
-      return validateShipment && validateShipment(shipment);
+      return validateShipment && !validateShipment(shipment);
     });
   };
 
@@ -562,7 +562,7 @@ const MoveHome = ({ serviceMemberMoves, isProfileComplete, serviceMember, signed
                   actionBtnDisabled={!hasOrdersAndUpload()}
                   actionBtnId="shipment-selection-btn"
                   onActionBtnClick={() => handleNewPathClick(shipmentSelectionPath)}
-                  complete={hasCompletedAllShipment()}
+                  complete={!hasIncompleteShipment() && hasAnyShipments()}
                   completedHeaderText="Shipments"
                   headerText="Set up shipments"
                   secondaryBtn={hasAnyShipments()}
@@ -593,7 +593,7 @@ const MoveHome = ({ serviceMemberMoves, isProfileComplete, serviceMember, signed
                   )}
                 </Step>
                 <Step
-                  actionBtnDisabled={!hasCompletedAllShipment()}
+                  actionBtnDisabled={hasIncompleteShipment() || !hasAnyShipments()}
                   actionBtnId="review-and-submit-btn"
                   actionBtnLabel={!hasSubmittedMove() ? 'Review and submit' : 'Review your request'}
                   complete={hasSubmittedMove()}
diff --git a/src/pages/MyMove/Home/index.jsx b/src/pages/MyMove/Home/index.jsx
index 5bd7aea6281..0cc153dcafc 100644
--- a/src/pages/MyMove/Home/index.jsx
+++ b/src/pages/MyMove/Home/index.jsx
@@ -145,9 +145,9 @@ export class Home extends Component {
     return !!finishedCloseout.length;
   }
 
-  get hasCompletedAllShipment() {
+  get hasIncompleteShipment() {
     const { mtoShipments } = this.props;
-    if (!mtoShipments || !mtoShipments?.length) return false;
+    if (!mtoShipments) return false;
     const shipmentValidators = {
       [SHIPMENT_TYPES.PPM]: isPPMShipmentComplete,
       [SHIPMENT_TYPES.BOAT_HAUL_AWAY]: isBoatShipmentComplete,
@@ -157,7 +157,7 @@ export class Home extends Component {
 
     return mtoShipments.some((shipment) => {
       const validateShipment = shipmentValidators[shipment.shipmentType];
-      return validateShipment && validateShipment(shipment);
+      return validateShipment && !validateShipment(shipment);
     });
   }
 
@@ -551,7 +551,7 @@ export class Home extends Component {
                     actionBtnDisabled={!this.hasOrders}
                     actionBtnId="shipment-selection-btn"
                     onActionBtnClick={() => this.handleNewPathClick(shipmentSelectionPath)}
-                    complete={this.hasCompletedAllShipment}
+                    complete={!this.hasIncompleteShipment && this.hasAnyShipments}
                     completedHeaderText="Shipments"
                     headerText="Set up shipments"
                     secondaryBtn={this.hasAnyShipments}
@@ -582,7 +582,7 @@ export class Home extends Component {
                     )}
                   </Step>
                   <Step
-                    actionBtnDisabled={!this.hasCompletedAllShipment}
+                    actionBtnDisabled={this.hasIncompleteShipment || !this.hasAnyShipments}
                     actionBtnId="review-and-submit-btn"
                     actionBtnLabel={!this.hasSubmittedMove ? 'Review and submit' : 'Review your request'}
                     complete={this.hasSubmittedMove}