diff --git a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
index 413e0ffc1..7359c0fab 100644
--- a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
+++ b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
@@ -59,28 +59,81 @@ public bool HasEnvironmentalControlDevices
         /// </summary>
         public IMobileControlRoomMessenger MobileControlRoomBridge { get; private set; }
 
+        protected const string _defaultListKey = "default";
+
         /// <summary>
         /// The config name of the source list
         /// </summary>
 		/// 
-		protected string _SourceListKey;
+		private string _sourceListKey;
         public string SourceListKey {
 			get
 			{
-				return _SourceListKey;
+                if(string.IsNullOrEmpty(_sourceListKey))
+                {
+                    return _defaultListKey;
+                }
+                else
+                {
+                    return _sourceListKey;
+                }
 			}
-			private set
+			protected set
 			{
-                if (value != _SourceListKey)
+                if (value != _sourceListKey)
                 {
-                    _SourceListKey = value;
+                    _sourceListKey = value;
                 }
 			}
 		}
 
-        public string DestinationListKey { get; private set; }
+        private string _destinationListKey;
+        public string DestinationListKey
+        {
+            get 
+            {
+                if (string.IsNullOrEmpty(_destinationListKey))
+                {
+                    return _defaultListKey;
+                }
+                else
+                {
+                    return _destinationListKey;
+                }
+            }
+            protected set
+            {
+                if (value != _destinationListKey)
+                {
+                    _destinationListKey = value;
+                }
+            }
+        }
+
+        private string _levelControlListKey;
+        public string LevelControlListKey
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_levelControlListKey))
+                {
+                    return _defaultListKey;
+                }
+                else
+                {
+                    return _destinationListKey;
+                }
+            }
+            protected set
+            {
+                if (value != _levelControlListKey)
+                {
+                    _levelControlListKey = value;
+                }
+            }
+        }
+
 
-        protected const string _defaultSourceListKey = "default";
 
         /// <summary>
         /// Timer used for informing the UIs of a shutdown
@@ -192,7 +245,7 @@ protected void SetSourceListKey(string sourceListKey)
             }
             else
             {
-                sourceListKey = _defaultSourceListKey;
+                sourceListKey = _defaultListKey;
             }
         }