diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs
index b68a4c04..6d80913f 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs	
@@ -27,6 +27,9 @@ namespace PepperDash.Essentials.Core
         {
             _propertiesConfig = props;
 
+            Partitions = new List<IPartitionController>();
+            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
+
             if (_propertiesConfig.ScenarioChangeDebounceTimeSeconds > 0)
             {
                 _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
@@ -136,11 +139,6 @@ namespace PepperDash.Essentials.Core
                         // the partition can't be found or the state doesn't match
                         return false;
                     }
-                    else
-                    {
-                        // check the next partition state
-                        continue;
-                    }
                 }
                 // if it hasn't returned false by now we have the matching scenario
                 return true;