diff --git a/lib/components/modes_toolbar.dart b/lib/components/modes_toolbar.dart
index c55e3bdb..575be5e3 100644
--- a/lib/components/modes_toolbar.dart
+++ b/lib/components/modes_toolbar.dart
@@ -22,7 +22,7 @@ class ModesToolbar extends StatelessWidget {
           onPressed: () {
             if (deviceId != null) {
               thermostatProvider.setThermostatMode(
-                  deviceId, GThermostatMode.AUTO);
+                  deviceId!, GThermostatMode.AUTO);
             }
           },
         ),
@@ -31,7 +31,7 @@ class ModesToolbar extends StatelessWidget {
           onPressed: () {
             if (deviceId != null) {
               thermostatProvider.setThermostatMode(
-                  deviceId, GThermostatMode.COOL);
+                  deviceId!, GThermostatMode.COOL);
             }
           },
         ),
@@ -40,7 +40,7 @@ class ModesToolbar extends StatelessWidget {
           onPressed: () {
             if (deviceId != null) {
               thermostatProvider.setThermostatMode(
-                  deviceId, GThermostatMode.HEAT);
+                  deviceId!, GThermostatMode.HEAT);
             }
           },
         ),
@@ -49,7 +49,7 @@ class ModesToolbar extends StatelessWidget {
           onPressed: () {
             if (deviceId != null) {
               thermostatProvider.setThermostatMode(
-                  deviceId, GThermostatMode.AIRFLOW);
+                  deviceId!, GThermostatMode.AIRFLOW);
             }
           },
         ),
diff --git a/test/components/modes_toolbar_test.dart b/test/components/modes_toolbar_test.dart
index fa121941..175aa128 100644
--- a/test/components/modes_toolbar_test.dart
+++ b/test/components/modes_toolbar_test.dart
@@ -39,7 +39,8 @@ void main() {
 
     await tester.tap(find.widgetWithText(ModeIconButton, "A"));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.AUTO)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.AUTO))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to cool when pressed',
@@ -48,7 +49,8 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.ac_unit));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.COOL)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.COOL))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to heat when pressed',
@@ -57,7 +59,8 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.whatshot));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.HEAT)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.HEAT))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to eco when pressed',
@@ -66,7 +69,7 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.eco));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.AIRFLOW))
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.AIRFLOW))
         .called(1);
   });
 
diff --git a/test/widgets/components/modes_toolbar_test.dart b/test/widgets/components/modes_toolbar_test.dart
index e3bf92a3..11da8f77 100644
--- a/test/widgets/components/modes_toolbar_test.dart
+++ b/test/widgets/components/modes_toolbar_test.dart
@@ -38,7 +38,8 @@ void main() {
 
     await tester.tap(find.widgetWithText(ModeIconButton, "A"));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.AUTO)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.AUTO))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to cool when pressed',
@@ -47,7 +48,8 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.ac_unit));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.COOL)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.COOL))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to heat when pressed',
@@ -56,7 +58,8 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.whatshot));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.HEAT)).called(1);
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.HEAT))
+        .called(1);
   });
 
   testWidgets('ModesToolbar - button should set mode to eco when pressed',
@@ -65,7 +68,7 @@ void main() {
 
     await tester.tap(find.widgetWithIcon(ModeIconButton, Icons.eco));
 
-    verify(mockProvider.setThermostatMode(any, GThermostatMode.AIRFLOW))
+    verify(mockProvider.setThermostatMode('any', GThermostatMode.AIRFLOW))
         .called(1);
   });
 }