diff --git a/orchestrator/src/shared/settings-schema.ts b/orchestrator/src/shared/settings-schema.ts
index 4339eb7..7b5d7ee 100644
--- a/orchestrator/src/shared/settings-schema.ts
+++ b/orchestrator/src/shared/settings-schema.ts
@@ -42,6 +42,13 @@ export const updateSettingsSchema = z.object({
         path: ["basicAuthUser"],
       });
     }
+    if (!data.basicAuthPassword || data.basicAuthPassword.trim() === "") {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Password is required when basic auth is enabled",
+        path: ["basicAuthPassword"],
+      });
+    }
   }
 });