diff --git a/assets/js/components/Site/Site.vue b/assets/js/components/Site/Site.vue
index b74554243..ef52c0749 100644
--- a/assets/js/components/Site/Site.vue
+++ b/assets/js/components/Site/Site.vue
@@ -177,7 +177,7 @@ export default defineComponent({
 			return this.battery?.soc;
 		},
 		batteryConfigured() {
-			return this.battery && this.battery.devices.length > 0;
+			return (this.battery?.devices?.length ?? 0) > 0;
 		},
 		pvConfigured() {
 			return this.pv?.length > 0;
diff --git a/assets/js/components/Top/Navigation.vue b/assets/js/components/Top/Navigation.vue
index 3aa5e9443..5ba73e434 100644
--- a/assets/js/components/Top/Navigation.vue
+++ b/assets/js/components/Top/Navigation.vue
@@ -177,7 +177,7 @@ export default defineComponent({
 	},
 	computed: {
 		batteryConfigured() {
-			return this.battery && this.battery.devices.length;
+			return (this.battery?.devices?.length ?? 0) > 0;
 		},
 		providers() {
 			return Object.entries(this.authProviders)
diff --git a/assets/js/types/evcc.ts b/assets/js/types/evcc.ts
index d4e011b34..616b7ca91 100644
--- a/assets/js/types/evcc.ts
+++ b/assets/js/types/evcc.ts
@@ -526,7 +526,7 @@ export interface Battery {
   power: number;
   capacity: number;
   soc: number;
-  devices: BatteryMeter[];
+  devices?: BatteryMeter[];
   forecast?: BatteryForecast;
 }
 
diff --git a/assets/js/views/App.vue b/assets/js/views/App.vue
index 0d6931fad..3b2cd5029 100644
--- a/assets/js/views/App.vue
+++ b/assets/js/views/App.vue
@@ -69,7 +69,7 @@ export default defineComponent({
 			return store.state.version;
 		},
 		batteryModalAvailabe() {
-			return store.state.battery?.devices.length;
+			return store.state.battery?.devices?.length;
 		},
 		showRoutes() {
 			return this.state.startupCompleted;