diff --git a/lib/pages/routines/models/gateway.dart b/lib/pages/routines/models/gateway.dart
index dcb29148..b1a70d2e 100644
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@@ -33,10 +33,11 @@ final class GatewaySwitchAlarmSound extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'switch_alarm_sound',
-    super.operationName = 'Switch Alarm Sound',
-    super.icon = Assets.activeBell,
-  });
+  }) : super(
+          code: 'switch_alarm_sound',
+          operationName: 'Switch Alarm Sound',
+          icon: Assets.activeBell,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() => [
@@ -58,10 +59,11 @@ final class GatewayMasterState extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'master_state',
-    super.operationName = 'Master State',
-    super.icon = Assets.gear,
-  });
+  }) : super(
+          code: 'master_state',
+          operationName: 'Master State',
+          icon: Assets.gear,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() {
@@ -85,10 +87,11 @@ final class GatewayFactoryReset extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'factory_reset',
-    super.operationName = 'Factory Reset',
-    super.icon = Assets.factoryReset,
-  });
+  }) : super(
+          code: 'factory_reset',
+          operationName: 'Factory Reset',
+          icon: Assets.factoryReset,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() {
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
index fc7189f2..364854ce 100644
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@@ -81,11 +81,8 @@ class _GatewayDialogState extends State<GatewayDialog> {
     final selectedGatewayFunctions = _gatewayFunctions.firstWhere(
       (f) => f.code == selectedFunction,
       orElse: () => GatewaySwitchAlarmSound(
-        code: selectedFunction ?? '',
         deviceId: '',
         deviceName: '',
-        operationName: '',
-        icon: '',
         type: '',
       ),
     );