diff --git a/web/features/deployments/detail/access-tab/developer-api-section.tsx b/web/features/deployments/detail/access-tab/developer-api-section.tsx
index 72f38e9e06..dc22afa8f7 100644
--- a/web/features/deployments/detail/access-tab/developer-api-section.tsx
+++ b/web/features/deployments/detail/access-tab/developer-api-section.tsx
@@ -103,19 +103,14 @@ export function DeveloperApiSection({
                   )
                 : (
                     <div className="flex flex-col divide-y divide-divider-subtle">
-                      {apiKeys.map((apiKey) => {
-                        const environmentId = apiKey.environmentId ?? apiKey.environment?.id
-                        if (!apiKey.id || !environmentId)
-                          return null
-                        return (
-                          <ApiKeyRow
-                            key={apiKey.id}
-                            apiKey={apiKey}
-                            onCopy={onCopyApiKey}
-                            onRevoke={onRevoke}
-                          />
-                        )
-                      })}
+                      {apiKeys.map(apiKey => (
+                        <ApiKeyRow
+                          key={apiKey.id}
+                          apiKey={apiKey}
+                          onCopy={onCopyApiKey}
+                          onRevoke={onRevoke}
+                        />
+                      ))}
                     </div>
                   )}
             </div>
diff --git a/web/features/deployments/list/index.tsx b/web/features/deployments/list/index.tsx
index 865079aca9..4483cd92e3 100644
--- a/web/features/deployments/list/index.tsx
+++ b/web/features/deployments/list/index.tsx
@@ -76,14 +76,12 @@ function DeploymentsList() {
       <DeploymentsListControls />
       <div className="relative grid grow grid-cols-1 content-start gap-4 px-12 pt-2 2k:grid-cols-6 sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-4 2xl:grid-cols-5">
         <NewInstanceCard />
-        {apps.map(app => app.id
-          ? (
-              <InstanceCard
-                key={app.id}
-                app={app}
-              />
-            )
-          : null)}
+        {apps.map(app => (
+          <InstanceCard
+            key={app.id}
+            app={app}
+          />
+        ))}
       </div>
 
       <div className="py-4" />