diff --git a/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx b/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
index f74f4b69b1..75ee549384 100644
--- a/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
+++ b/frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
@@ -70,45 +70,47 @@ const ModelVersionsDetailsHeaderActions: React.FC<ModelVersionsDetailsHeaderActi
           </DropdownItem>
         </DropdownList>
       </Dropdown>
-      <DeployRegisteredModelModal
-        onSubmit={() => {
-          refresh();
-          navigate(
-            modelVersionDeploymentsUrl(
-              mv.id,
-              mv.registeredModelId,
-              preferredModelRegistry?.metadata.name,
-            ),
-          );
-        }}
-        onCancel={() => setIsDeployModalOpen(false)}
-        isOpen={isDeployModalOpen}
-        modelVersion={mv}
-      />
-      <ArchiveModelVersionModal
-        onCancel={() => setIsArchiveModalOpen(false)}
-        onSubmit={() =>
-          apiState.api
-            .patchModelVersion(
-              {},
-              {
-                state: ModelState.ARCHIVED,
-              },
-              mv.id,
-            )
-            .then(() =>
-              navigate(
-                modelVersionArchiveDetailsUrl(
-                  mv.id,
-                  mv.registeredModelId,
-                  preferredModelRegistry?.metadata.name,
-                ),
+      {isDeployModalOpen ? (
+        <DeployRegisteredModelModal
+          onSubmit={() => {
+            refresh();
+            navigate(
+              modelVersionDeploymentsUrl(
+                mv.id,
+                mv.registeredModelId,
+                preferredModelRegistry?.metadata.name,
               ),
-            )
-        }
-        isOpen={isArchiveModalOpen}
-        modelVersionName={mv.name}
-      />
+            );
+          }}
+          onCancel={() => setIsDeployModalOpen(false)}
+          modelVersion={mv}
+        />
+      ) : null}
+      {isArchiveModalOpen ? (
+        <ArchiveModelVersionModal
+          onCancel={() => setIsArchiveModalOpen(false)}
+          onSubmit={() =>
+            apiState.api
+              .patchModelVersion(
+                {},
+                {
+                  state: ModelState.ARCHIVED,
+                },
+                mv.id,
+              )
+              .then(() =>
+                navigate(
+                  modelVersionArchiveDetailsUrl(
+                    mv.id,
+                    mv.registeredModelId,
+                    preferredModelRegistry?.metadata.name,
+                  ),
+                ),
+              )
+          }
+          modelVersionName={mv.name}
+        />
+      ) : null}
     </>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx b/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
index 3bc6ccb344..654d062283 100644
--- a/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
+++ b/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
@@ -63,22 +63,23 @@ const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
           </Dropdown>
         </FlexItem>
       </Flex>
-      <ArchiveRegisteredModelModal
-        onCancel={() => setIsArchiveModalOpen(false)}
-        onSubmit={() =>
-          apiState.api
-            .patchRegisteredModel(
-              {},
-              {
-                state: ModelState.ARCHIVED,
-              },
-              rm.id,
-            )
-            .then(() => navigate(registeredModelsUrl(preferredModelRegistry?.metadata.name)))
-        }
-        isOpen={isArchiveModalOpen}
-        registeredModelName={rm.name}
-      />
+      {isArchiveModalOpen ? (
+        <ArchiveRegisteredModelModal
+          onCancel={() => setIsArchiveModalOpen(false)}
+          onSubmit={() =>
+            apiState.api
+              .patchRegisteredModel(
+                {},
+                {
+                  state: ModelState.ARCHIVED,
+                },
+                rm.id,
+              )
+              .then(() => navigate(registeredModelsUrl(preferredModelRegistry?.metadata.name)))
+          }
+          registeredModelName={rm.name}
+        />
+      ) : null}
     </>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx b/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
index 88e7fe3a11..33e7dca3ca 100644
--- a/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
+++ b/frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
@@ -101,60 +101,63 @@ const ModelVersionsTableRow: React.FC<ModelVersionsTableRowProps> = ({
       {!isArchiveModel && (
         <Td isActionCell>
           <ActionsColumn items={actions} />
-          <ArchiveModelVersionModal
-            onCancel={() => setIsArchiveModalOpen(false)}
-            onSubmit={() =>
-              apiState.api
-                .patchModelVersion(
-                  {},
-                  {
-                    state: ModelState.ARCHIVED,
-                  },
-                  mv.id,
-                )
-                .then(refresh)
-            }
-            isOpen={isArchiveModalOpen}
-            modelVersionName={mv.name}
-          />
-          <DeployRegisteredModelModal
-            onSubmit={() =>
-              navigate(
-                modelVersionDeploymentsUrl(
-                  mv.id,
-                  mv.registeredModelId,
-                  preferredModelRegistry?.metadata.name,
-                ),
-              )
-            }
-            onCancel={() => setIsDeployModalOpen(false)}
-            isOpen={isDeployModalOpen}
-            modelVersion={mv}
-          />
-          <RestoreModelVersionModal
-            onCancel={() => setIsRestoreModalOpen(false)}
-            onSubmit={() =>
-              apiState.api
-                .patchModelVersion(
-                  {},
-                  {
-                    state: ModelState.LIVE,
-                  },
-                  mv.id,
-                )
-                .then(() =>
-                  navigate(
-                    modelVersionUrl(
-                      mv.id,
-                      mv.registeredModelId,
-                      preferredModelRegistry?.metadata.name,
-                    ),
+          {isArchiveModalOpen ? (
+            <ArchiveModelVersionModal
+              onCancel={() => setIsArchiveModalOpen(false)}
+              onSubmit={() =>
+                apiState.api
+                  .patchModelVersion(
+                    {},
+                    {
+                      state: ModelState.ARCHIVED,
+                    },
+                    mv.id,
+                  )
+                  .then(refresh)
+              }
+              modelVersionName={mv.name}
+            />
+          ) : null}
+          {isDeployModalOpen ? (
+            <DeployRegisteredModelModal
+              onSubmit={() =>
+                navigate(
+                  modelVersionDeploymentsUrl(
+                    mv.id,
+                    mv.registeredModelId,
+                    preferredModelRegistry?.metadata.name,
                   ),
                 )
-            }
-            isOpen={isRestoreModalOpen}
-            modelVersionName={mv.name}
-          />
+              }
+              onCancel={() => setIsDeployModalOpen(false)}
+              modelVersion={mv}
+            />
+          ) : null}
+          {isRestoreModalOpen ? (
+            <RestoreModelVersionModal
+              onCancel={() => setIsRestoreModalOpen(false)}
+              onSubmit={() =>
+                apiState.api
+                  .patchModelVersion(
+                    {},
+                    {
+                      state: ModelState.LIVE,
+                    },
+                    mv.id,
+                  )
+                  .then(() =>
+                    navigate(
+                      modelVersionUrl(
+                        mv.id,
+                        mv.registeredModelId,
+                        preferredModelRegistry?.metadata.name,
+                      ),
+                    ),
+                  )
+              }
+              modelVersionName={mv.name}
+            />
+          ) : null}
         </Td>
       )}
     </Tr>
diff --git a/frontend/src/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx b/frontend/src/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
index 8fee6dde10..a4e65ab1a9 100644
--- a/frontend/src/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
+++ b/frontend/src/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
@@ -109,7 +109,7 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
           />
         )}
       </ApplicationsPage>
-      {mv !== null && (
+      {mv !== null && isRestoreModalOpen ? (
         <RestoreModelVersionModal
           onCancel={() => setIsRestoreModalOpen(false)}
           onSubmit={() =>
@@ -125,10 +125,9 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
                 navigate(modelVersionUrl(mv.id, rm?.id, preferredModelRegistry?.metadata.name)),
               )
           }
-          isOpen={isRestoreModalOpen}
           modelVersionName={mv.name}
         />
-      )}
+      ) : null}
     </>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/ConnectionModal.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/ConnectionModal.tsx
index f9f65694f9..4c1b37dbe2 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/ConnectionModal.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/ConnectionModal.tsx
@@ -5,16 +5,15 @@ import { DataConnection } from '~/pages/projects/types';
 import { ConnectionDropdown } from './ConnectionDropdown';
 
 export const ConnectionModal: React.FC<{
-  isOpen: boolean;
   onClose: () => void;
   onSubmit: (connection: DataConnection) => void;
-}> = ({ isOpen = false, onClose, onSubmit }) => {
+}> = ({ onClose, onSubmit }) => {
   const [project, setProject] = React.useState<string | undefined>(undefined);
   const [connection, setConnection] = React.useState<DataConnection | undefined>(undefined);
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       data-testid="connection-autofill-modal"
       variant="medium"
       title="Autofill from data connection"
diff --git a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
index 2aaea4268b..19618234d8 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
@@ -235,14 +235,15 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
           }
         />
       </FormSection>
-      <ConnectionModal
-        isOpen={isAutofillModalOpen}
-        onClose={() => setAutofillModalOpen(false)}
-        onSubmit={(connection) => {
-          fillObjectStorageByConnection(connection);
-          setAutofillModalOpen(false);
-        }}
-      />
+      {isAutofillModalOpen ? (
+        <ConnectionModal
+          onClose={() => setAutofillModalOpen(false)}
+          onSubmit={(connection) => {
+            fillObjectStorageByConnection(connection);
+            setAutofillModalOpen(false);
+          }}
+        />
+      ) : null}
     </>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx b/frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
index 02f8e6d077..1abdd11026 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
@@ -93,40 +93,42 @@ const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
       </Td>
       <Td isActionCell>
         <ActionsColumn items={actions} />
-        <ArchiveRegisteredModelModal
-          onCancel={() => setIsArchiveModalOpen(false)}
-          onSubmit={() =>
-            apiState.api
-              .patchRegisteredModel(
-                {},
-                {
-                  state: ModelState.ARCHIVED,
-                },
-                rm.id,
-              )
-              .then(refresh)
-          }
-          isOpen={isArchiveModalOpen}
-          registeredModelName={rm.name}
-        />
-        <RestoreRegisteredModelModal
-          onCancel={() => setIsRestoreModalOpen(false)}
-          onSubmit={() =>
-            apiState.api
-              .patchRegisteredModel(
-                {},
-                {
-                  state: ModelState.LIVE,
-                },
-                rm.id,
-              )
-              .then(() =>
-                navigate(registeredModelUrl(rm.id, preferredModelRegistry?.metadata.name)),
-              )
-          }
-          isOpen={isRestoreModalOpen}
-          registeredModelName={rm.name}
-        />
+        {isArchiveModalOpen ? (
+          <ArchiveRegisteredModelModal
+            onCancel={() => setIsArchiveModalOpen(false)}
+            onSubmit={() =>
+              apiState.api
+                .patchRegisteredModel(
+                  {},
+                  {
+                    state: ModelState.ARCHIVED,
+                  },
+                  rm.id,
+                )
+                .then(refresh)
+            }
+            registeredModelName={rm.name}
+          />
+        ) : null}
+        {isRestoreModalOpen ? (
+          <RestoreRegisteredModelModal
+            onCancel={() => setIsRestoreModalOpen(false)}
+            onSubmit={() =>
+              apiState.api
+                .patchRegisteredModel(
+                  {},
+                  {
+                    state: ModelState.LIVE,
+                  },
+                  rm.id,
+                )
+                .then(() =>
+                  navigate(registeredModelUrl(rm.id, preferredModelRegistry?.metadata.name)),
+                )
+            }
+            registeredModelName={rm.name}
+          />
+        ) : null}
       </Td>
     </Tr>
   );
diff --git a/frontend/src/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx b/frontend/src/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
index 5b718dc1b9..c201d42da4 100644
--- a/frontend/src/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
+++ b/frontend/src/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
@@ -84,7 +84,7 @@ const RegisteredModelsArchiveDetails: React.FC<RegisteredModelsArchiveDetailsPro
         )}
       </ApplicationsPage>
 
-      {rm !== null && (
+      {rm !== null && isRestoreModalOpen ? (
         <RestoreRegisteredModelModal
           onCancel={() => setIsRestoreModalOpen(false)}
           onSubmit={() =>
@@ -100,10 +100,9 @@ const RegisteredModelsArchiveDetails: React.FC<RegisteredModelsArchiveDetailsPro
                 navigate(registeredModelUrl(rm.id, preferredModelRegistry?.metadata.name)),
               )
           }
-          isOpen={isRestoreModalOpen}
           registeredModelName={rm.name}
         />
-      )}
+      ) : null}
     </>
   );
 };
diff --git a/frontend/src/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx b/frontend/src/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
index c1c2ca552c..262c15636d 100644
--- a/frontend/src/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
@@ -6,14 +6,12 @@ import useNotification from '~/utilities/useNotification';
 interface ArchiveModelVersionModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   modelVersionName: string;
 }
 
 export const ArchiveModelVersionModal: React.FC<ArchiveModelVersionModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   modelVersionName,
 }) => {
   const notification = useNotification();
@@ -45,7 +43,7 @@ export const ArchiveModelVersionModal: React.FC<ArchiveModelVersionModalProps> =
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title="Archive version?"
       titleIconVariant="warning"
       variant="small"
diff --git a/frontend/src/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx b/frontend/src/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
index 060baaa901..2c770f06a5 100644
--- a/frontend/src/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
@@ -6,14 +6,12 @@ import useNotification from '~/utilities/useNotification';
 interface ArchiveRegisteredModelModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   registeredModelName: string;
 }
 
 export const ArchiveRegisteredModelModal: React.FC<ArchiveRegisteredModelModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   registeredModelName,
 }) => {
   const notification = useNotification();
@@ -45,7 +43,7 @@ export const ArchiveRegisteredModelModal: React.FC<ArchiveRegisteredModelModalPr
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title="Archive model?"
       titleIconVariant="warning"
       variant="small"
diff --git a/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx b/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx
index 4273642038..32fcedc013 100644
--- a/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/DeployRegisteredModelModal.tsx
@@ -15,14 +15,12 @@ import { getKServeTemplates } from '~/pages/modelServing/customServingRuntimes/u
 import useDataConnections from '~/pages/projects/screens/detail/data-connections/useDataConnections';
 
 interface DeployRegisteredModelModalProps {
-  isOpen: boolean;
   modelVersion: ModelVersion;
   onCancel: () => void;
   onSubmit?: () => void;
 }
 
 const DeployRegisteredModelModal: React.FC<DeployRegisteredModelModalProps> = ({
-  isOpen,
   modelVersion,
   onCancel,
   onSubmit,
@@ -63,82 +61,57 @@ const DeployRegisteredModelModal: React.FC<DeployRegisteredModelModalProps> = ({
     [onCancel, onSubmit],
   );
 
-  if (isOpen) {
-    if (
-      (platform === ServingRuntimePlatform.MULTI && !projectDeployStatusLoaded) ||
-      !selectedProject ||
-      !platform
-    ) {
-      return (
-        <Modal
-          title="Deploy model"
-          description="Configure properties for deploying your model"
-          variant="medium"
-          isOpen
-          onClose={() => onClose(false)}
-          actions={[
-            <Button key="deploy" variant="primary" isDisabled>
-              Deploy
-            </Button>,
-            <Button key="cancel" variant="link" onClick={() => onClose(false)}>
-              Cancel
-            </Button>,
-          ]}
-          showClose
-        >
-          <Form>
-            {deployInfoError ? (
-              <Alert variant="danger" isInline title={deployInfoError.name}>
-                {deployInfoError.message}
-              </Alert>
-            ) : !deployInfoLoaded ? (
-              <Spinner />
-            ) : (
-              <FormSection title="Model deployment">
-                <ProjectSelector
-                  selectedProject={selectedProject}
-                  setSelectedProject={setSelectedProject}
-                  error={error}
-                  isOpen={isProjectSelectorOpen}
-                  setOpen={setProjectSelectorOpen}
-                />
-              </FormSection>
-            )}
-          </Form>
-        </Modal>
-      );
-    }
-
-    if (platform === ServingRuntimePlatform.SINGLE) {
-      return (
-        <ManageKServeModal
-          onClose={onClose}
-          isOpen
-          servingRuntimeTemplates={getKServeTemplates(
-            templates,
-            templateOrder,
-            templateDisablement,
+  if (
+    (platform === ServingRuntimePlatform.MULTI && !projectDeployStatusLoaded) ||
+    !selectedProject ||
+    !platform
+  ) {
+    return (
+      <Modal
+        title="Deploy model"
+        description="Configure properties for deploying your model"
+        variant="medium"
+        isOpen
+        onClose={() => onClose(false)}
+        actions={[
+          <Button key="deploy" variant="primary" isDisabled>
+            Deploy
+          </Button>,
+          <Button key="cancel" variant="link" onClick={() => onClose(false)}>
+            Cancel
+          </Button>,
+        ]}
+        showClose
+      >
+        <Form>
+          {deployInfoError ? (
+            <Alert variant="danger" isInline title={deployInfoError.name}>
+              {deployInfoError.message}
+            </Alert>
+          ) : !deployInfoLoaded ? (
+            <Spinner />
+          ) : (
+            <FormSection title="Model deployment">
+              <ProjectSelector
+                selectedProject={selectedProject}
+                setSelectedProject={setSelectedProject}
+                error={error}
+                isOpen={isProjectSelectorOpen}
+                setOpen={setProjectSelectorOpen}
+              />
+            </FormSection>
           )}
-          shouldFormHidden={!!error}
-          registeredModelDeployInfo={registeredModelDeployInfo}
-          projectContext={{ currentProject: selectedProject, dataConnections }}
-          projectSection={
-            <ProjectSelector
-              selectedProject={selectedProject}
-              setSelectedProject={setSelectedProject}
-              error={error}
-              isOpen={isProjectSelectorOpen}
-              setOpen={setProjectSelectorOpen}
-            />
-          }
-        />
-      );
-    }
-    // platform === ServingRuntimePlatform.MULTI
+        </Form>
+      </Modal>
+    );
+  }
+
+  if (platform === ServingRuntimePlatform.SINGLE) {
     return (
-      <ManageInferenceServiceModal
+      <ManageKServeModal
         onClose={onClose}
         isOpen
+        servingRuntimeTemplates={getKServeTemplates(templates, templateOrder, templateDisablement)}
         shouldFormHidden={!!error}
         registeredModelDeployInfo={registeredModelDeployInfo}
         projectContext={{ currentProject: selectedProject, dataConnections }}
@@ -154,7 +127,25 @@ const DeployRegisteredModelModal: React.FC<DeployRegisteredModelModalProps> = ({
       />
     );
   }
-  return null;
+  // platform === ServingRuntimePlatform.MULTI
+  return (
+    <ManageInferenceServiceModal
+      onClose={onClose}
+      isOpen
+      shouldFormHidden={!!error}
+      registeredModelDeployInfo={registeredModelDeployInfo}
+      projectContext={{ currentProject: selectedProject, dataConnections }}
+      projectSection={
+        <ProjectSelector
+          selectedProject={selectedProject}
+          setSelectedProject={setSelectedProject}
+          error={error}
+          isOpen={isProjectSelectorOpen}
+          setOpen={setProjectSelectorOpen}
+        />
+      }
+    />
+  );
 };
 
 export default DeployRegisteredModelModal;
diff --git a/frontend/src/pages/modelRegistry/screens/components/ModelLabels.tsx b/frontend/src/pages/modelRegistry/screens/components/ModelLabels.tsx
index 37e84e51de..4c8c56b9a1 100644
--- a/frontend/src/pages/modelRegistry/screens/components/ModelLabels.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/ModelLabels.tsx
@@ -69,11 +69,11 @@ const ModelLabels: React.FC<ModelLabelsProps> = ({ name, customProperties }) =>
     </Label>
   );
 
-  const labelModal = (
+  const labelModal = isLabelModalOpen ? (
     <Modal
       variant={ModalVariant.small}
       title="Labels"
-      isOpen={isLabelModalOpen}
+      isOpen
       onClose={() => setIsLabelModalOpen(false)}
       description={
         <Text>
@@ -104,7 +104,7 @@ const ModelLabels: React.FC<ModelLabelsProps> = ({ name, customProperties }) =>
         {labelsComponent(filteredLabels, '50ch')}
       </LabelGroup>
     </Modal>
-  );
+  ) : null;
 
   if (Object.keys(customProperties).length === 0) {
     return '-';
diff --git a/frontend/src/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx b/frontend/src/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
index dedfcc9270..cd81c2795c 100644
--- a/frontend/src/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
@@ -6,14 +6,12 @@ import useNotification from '~/utilities/useNotification';
 interface RestoreModelVersionModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   modelVersionName: string;
 }
 
 export const RestoreModelVersionModal: React.FC<RestoreModelVersionModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   modelVersionName,
 }) => {
   const notification = useNotification();
@@ -42,7 +40,7 @@ export const RestoreModelVersionModal: React.FC<RestoreModelVersionModalProps> =
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title="Restore version?"
       variant="small"
       onClose={onClose}
diff --git a/frontend/src/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx b/frontend/src/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
index 9207519a03..128f312af4 100644
--- a/frontend/src/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
+++ b/frontend/src/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
@@ -6,14 +6,12 @@ import useNotification from '~/utilities/useNotification';
 interface RestoreRegisteredModelModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   registeredModelName: string;
 }
 
 export const RestoreRegisteredModelModal: React.FC<RestoreRegisteredModelModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   registeredModelName,
 }) => {
   const notification = useNotification();
@@ -42,7 +40,7 @@ export const RestoreRegisteredModelModal: React.FC<RestoreRegisteredModelModalPr
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title="Restore model?"
       variant="small"
       onClose={onClose}