diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
index 4900af9b..0542f888 100644
--- a/lib/pages/routines/create_new_routines/create_new_routines.dart
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -161,10 +161,8 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
                           Center(
-                            child: Center(
-                              child: CircularProgressIndicator(
-                                color: ColorsManager.primaryColor,
-                              ),
+                            child: CircularProgressIndicator(
+                              color: ColorsManager.primaryColor,
                             ),
                           ),
                         ],
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index e065080f..b7733511 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -170,7 +170,7 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       orElse: () => DeviceFunctionData(
         entityId: '',
         functionCode: selectedFunction,
-        operationName: state.selectedOperationName!,
+        operationName: state.selectedOperationName ?? '',
         value: null,
       ),
     );