diff --git a/lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart b/lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart
index 9e63b16..a7e8197 100644
--- a/lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart
+++ b/lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart
@@ -47,7 +47,7 @@ class FourSceneScreen extends StatelessWidget {
           }
 
           return DefaultScaffold(
-            title: _bloc.deviceInfo.name,
+            title: device?.name ?? '4 Scene',
             actions: [
               InkWell(
                 onTap: () async {
@@ -165,7 +165,7 @@ class FourSceneScreen extends StatelessWidget {
                                                   Navigator.of(context).pop();
                                                 },
                                                 confirmTab:
-                                                    (switchSelected) async {
+                                                    (switchSelected)  {
                                                   Navigator.of(context).push(
                                                     MaterialPageRoute(
                                                       builder: (context) =>