diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index 4101cbfc63363..bbb37564d776f 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -82,7 +82,6 @@ function BaseModal(
         shouldPreventScrollOnFocus = false,
         enableEdgeToEdgeBottomSafeAreaPadding,
         shouldApplySidePanelOffset = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED,
-        canBeClosedByOtherModal = true,
     }: BaseModalProps,
     ref: React.ForwardedRef<View>,
 ) {
@@ -140,9 +139,7 @@ function BaseModal(
         if (isVisible) {
             willAlertModalBecomeVisible(true, type === CONST.MODAL.MODAL_TYPE.POPOVER || type === CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED);
             // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
-            if (canBeClosedByOtherModal) {
-                removeOnCloseListener = setCloseModal(onClose);
-            }
+            removeOnCloseListener = setCloseModal(onClose);
         }
 
         return () => {
@@ -151,7 +148,7 @@ function BaseModal(
             }
             removeOnCloseListener();
         };
-    }, [isVisible, wasVisible, onClose, type, canBeClosedByOtherModal]);
+    }, [isVisible, wasVisible, onClose, type]);
 
     useEffect(() => {
         hideModalCallbackRef.current = hideModal;
diff --git a/src/components/Modal/types.ts b/src/components/Modal/types.ts
index ca4e43bfa8bb5..c15ea3480fc7c 100644
--- a/src/components/Modal/types.ts
+++ b/src/components/Modal/types.ts
@@ -120,11 +120,6 @@ type BaseModalProps = Partial<ReactNativeModalProps> &
          * This is used to adjust the modal position when the Side Panel is open.
          */
         shouldApplySidePanelOffset?: boolean;
-
-        /**
-         * Whether the modal can be closed by other modals
-         */
-        canBeClosedByOtherModal?: boolean;
     };
 
 export default BaseModalProps;
diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
index 43743dc610149..7630a6d290b71 100644
--- a/src/components/TestToolsModal.tsx
+++ b/src/components/TestToolsModal.tsx
@@ -28,8 +28,8 @@ const modalContentMaxHeightPercentage = 0.75;
 
 function TestToolsModal() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const [isTestToolsModalOpen = false] = useOnyx(ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN);
-    const [shouldStoreLogs = false] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS);
+    const [isTestToolsModalOpen = false] = useOnyx(ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN, {canBeMissing: true});
+    const [shouldStoreLogs = false] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS, {canBeMissing: true});
     const {windowWidth, windowHeight} = useWindowDimensions();
     const StyleUtils = useStyleUtils();
     const styles = useThemeStyles();
@@ -38,10 +38,6 @@ function TestToolsModal() {
     const isAuthenticated = useIsAuthenticated();
     const route = getRouteBasedOnAuthStatus(isAuthenticated, activeRoute);
 
-    if (!isTestToolsModalOpen) {
-        return null;
-    }
-
     return (
         <Modal
             isVisible={!!isTestToolsModalOpen}
diff --git a/src/components/ValidateCodeActionModal/index.tsx b/src/components/ValidateCodeActionModal/index.tsx
index 13c8418ecb359..d12fdeab79071 100644
--- a/src/components/ValidateCodeActionModal/index.tsx
+++ b/src/components/ValidateCodeActionModal/index.tsx
@@ -72,7 +72,6 @@ function ValidateCodeActionModal({
             useNativeDriver
             shouldUseModalPaddingStyle={false}
             animationInTiming={disableAnimation ? 1 : undefined}
-            canBeClosedByOtherModal={false}
         >
             <ScreenWrapper
                 includeSafeAreaPaddingBottom