From e2cdb1238b5da92fef31952f049024e4ee7f94f0 Mon Sep 17 00:00:00 2001
From: Aviv Cohn <acohn@pepperdash.com>
Date: Fri, 20 Mar 2026 12:42:00 -0400
Subject: [PATCH 1/2] fix: calls scenario in SetRoomCombinationScenario
 preventing null from breaking rendering

---
 .../Room/Combining/EssentialsRoomCombiner.cs                    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
index a45adb279..6c38b9d69 100644
--- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
@@ -446,6 +446,8 @@ public void SetRoomCombinationScenario(string scenarioKey)
                     {
                         Debug.LogMessage(LogEventLevel.Debug, this, "Unable to find partition with key: '{0}'", partitionState.PartitionKey);
                     }
+                    // Sets the scenario while disregarding the returned task. This prevents current scenario from being null when starting in manual mode.
+                _ = ChangeScenario(scenario);
                 }
             }
             else

From e003e4dc945e49abe8e635414612bff42a89894b Mon Sep 17 00:00:00 2001
From: Aviv Cohn <acohn@pepperdash.com>
Date: Fri, 20 Mar 2026 13:43:10 -0400
Subject: [PATCH 2/2] fix: move ChangeScenario outside of loop, remove the
 discard modifier

---
 .../Room/Combining/EssentialsRoomCombiner.cs                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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