diff --git a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs
index 59a78ffb..593c9cce 100644
--- a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs
+++ b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs
@@ -248,9 +248,10 @@ namespace PepperDash.Essentials.Core.Fusion
                 Feedbacks.Add(HelpRequestResponseFeedback);
                 Feedbacks.Add(HelpRequestSentFeedback);
                 Feedbacks.Add(HelpRequestStatusFeedback);
-                Feedbacks.Add(RoomOccupancyRemoteStringFeedback);
-                Feedbacks.Add(RoomIsOccupiedFeedback);
-            
+                if (RoomOccupancyRemoteStringFeedback != null)
+                    Feedbacks.Add(RoomOccupancyRemoteStringFeedback);
+                if (RoomIsOccupiedFeedback != null)
+                    Feedbacks.Add(RoomIsOccupiedFeedback);
 
             }
             catch (Exception e)