diff --git a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
index a45adb279..9a354ba72 100644
--- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
@@ -445,8 +445,10 @@ public void SetRoomCombinationScenario(string scenarioKey)
                     else
                     {
                         Debug.LogMessage(LogEventLevel.Debug, this, "Unable to find partition with key: '{0}'", partitionState.PartitionKey);
-                    }
+                    }                  
                 }
+                // Activates the scenario to prevent _currentScenario from being null when starting in manual mode.
+                ChangeScenario(scenario);
             }
             else
             {