diff --git a/packages/features/apps/AdminAppsList.tsx b/packages/features/apps/AdminAppsList.tsx
index 1d4ad2b0e6..b40c1ec91e 100644
--- a/packages/features/apps/AdminAppsList.tsx
+++ b/packages/features/apps/AdminAppsList.tsx
@@ -315,16 +315,18 @@ const AdminAppsListContainer = () => {
           />
         ))}
       </List>
-      <EditKeysModal
-        keys={modalState.keys}
-        dirName={modalState.dirName}
-        handleModelClose={handleModelClose}
-        isOpen={modalState.isOpen === "editKeys"}
-        slug={modalState.slug}
-        type={modalState.type}
-        fromEnabled={modalState.fromEnabled}
-        appName={modalState.appName}
-      />
+      {modalState.isOpen === "editKeys" && (
+        <EditKeysModal
+          keys={modalState.keys}
+          dirName={modalState.dirName}
+          handleModelClose={handleModelClose}
+          isOpen={modalState.isOpen === "editKeys"}
+          slug={modalState.slug}
+          type={modalState.type}
+          fromEnabled={modalState.fromEnabled}
+          appName={modalState.appName}
+        />
+      )}
     </>
   );
 };