diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4883faf..35f954b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,7 @@ jobs:
         with:
           args: |
             --armhf \
+            --armv7 \
             --amd64 \
             --i386 \
             --target smartblueberry
diff --git a/smartblueberry/backend/plugins/homeassistant/modules/light.ts b/smartblueberry/backend/plugins/homeassistant/modules/light.ts
index 0657354..2455fc6 100644
--- a/smartblueberry/backend/plugins/homeassistant/modules/light.ts
+++ b/smartblueberry/backend/plugins/homeassistant/modules/light.ts
@@ -388,9 +388,10 @@ async function getAreaLightMode(server: hapi.Server, areaId: string) {
     return undefined
   }
 
-  const lightModes = await server.plugins.storage.get<{
-    [key: string]: LightMode
-  }>('light/modes')
+  const lightModes =
+    (await server.plugins.storage.get<{
+      [key: string]: LightMode
+    }>('light/modes')) || []
   const lightMode = Object.values(lightModes).find(
     ({ name }) => name == lightModeEntity?.state
   )
diff --git a/smartblueberry/config.json b/smartblueberry/config.json
index 2d0a2f3..ab7fbaa 100644
--- a/smartblueberry/config.json
+++ b/smartblueberry/config.json
@@ -7,6 +7,7 @@
   "image": "janwo/smartblueberry-{arch}",
   "arch": [
     "armhf",
+    "armv7",
     "amd64",
     "i386"
   ],
diff --git a/smartblueberry/frontend/src/app/setup/setup.component.html b/smartblueberry/frontend/src/app/setup/setup.component.html
index af80c03..f2d935e 100644
--- a/smartblueberry/frontend/src/app/setup/setup.component.html
+++ b/smartblueberry/frontend/src/app/setup/setup.component.html
@@ -133,7 +133,7 @@ <h2 i18n>Long-Lived Connection to Home Assistant</h2>
       <div class="control">
         <button
           [disabled]="
-            !haService.isGloballyConnected() && haService.isSupervised()
+            !haService.isGloballyConnected() || haService.isSupervised()
           "
           i18n
           type="submit"