diff --git a/startos/actions/set-admin-password.ts b/startos/actions/set-admin-password.ts
index 1018732..bca2c8e 100644
--- a/startos/actions/set-admin-password.ts
+++ b/startos/actions/set-admin-password.ts
@@ -32,8 +32,12 @@ export const setAdminPassword = sdk.Action.withInput(
   async ({ effects }) => {
     const current = await store.read().const(effects)
 
+    if (!current?.adminPassword) {
+      return null
+    }
+
     return {
-      password: current?.adminPassword ?? null,
+      password: current.adminPassword,
     }
   },