diff --git a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
index 2c2b1193..513a4d6e 100644
--- a/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
+++ b/modules/legacy/modules/control_panel/lib/src/features/control_panel/presentation/control_panel_screen.dart
@@ -132,7 +132,7 @@ class _Header extends ConsumerWidget {
                     );
                   }).toList(),
                   values: state.devices,
-                  value: state.selectedDevice,
+                  value: state.devices.where((d) => d.id == state.selectedDevice?.id).firstOrNull,
                   onChanged: (device) {
                     vm.setSelectedDevice(device);
                   },