diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 96919364..caf92489 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
 
 class DeviceDialogHelper {
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index eebf3fb7..5ca549fb 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -71,7 +71,8 @@ class IfContainer extends StatelessWidget {
                                       '1G',
                                       '2G',
                                       '3G',
-                                      'WPS'
+                                      'WPS',
+                                      'CPS',
                                     ].contains(
                                         state.ifItems[index]['productType'])) {
                                       context.read<RoutineBloc>().add(
@@ -129,7 +130,7 @@ class IfContainer extends StatelessWidget {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS']
+                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
                     .contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()
diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 2d3f7236..5f642bac 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -38,7 +38,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
                 device.productType == '1G' ||
                 device.productType == '2G' ||
                 device.productType == '3G' ||
-                device.productType == 'WPS')
+                device.productType == 'WPS' ||
+                device.productType == 'CPS')
             .toList();
 
         return Wrap(
diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index a4d0461d..d1856879 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -3,10 +3,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
 import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 
@@ -113,7 +113,8 @@ class ThenContainer extends StatelessWidget {
                                           '1G',
                                           '2G',
                                           '3G',
-                                          'WPS'
+                                          'WPS',
+                                          'CPS',
                                         ].contains(state.thenItems[index]
                                             ['productType'])) {
                                           context.read<RoutineBloc>().add(
@@ -229,7 +230,7 @@ class ThenContainer extends StatelessWidget {
                 dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS']
+            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
                 .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }