diff --git a/Log/ClientInfo.cs b/Log/ClientInfo.cs
index 7428a5bb..a48312e0 100644
--- a/Log/ClientInfo.cs
+++ b/Log/ClientInfo.cs
@@ -62,7 +62,7 @@ private static readonly Lazy<ClientInfo>
         /// <summary>
         /// Current Layout Id
         /// </summary>
-        public string CurrentLayoutId;
+        public int CurrentLayoutId;
 
         /// <summary>
         /// XMR Status
diff --git a/Logic/ScheduleManager.cs b/Logic/ScheduleManager.cs
index b34b80be..d9414838 100644
--- a/Logic/ScheduleManager.cs
+++ b/Logic/ScheduleManager.cs
@@ -146,22 +146,6 @@ public bool RefreshSchedule
         /// </summary>
         public List<ScheduleItem> CurrentInterruptSchedule { get; private set; }
 
-        /// <summary>
-        /// Get or Set the current layout id
-        /// </summary>
-        public int CurrentLayoutId
-        {
-            get
-            {
-                return _currenctLayoutId;
-            }
-            set
-            {
-                lock (_locker)
-                    _currenctLayoutId = value;
-            }
-        }
-
         #endregion
 
         /// <summary>
@@ -620,7 +604,7 @@ private List<ScheduleItem> LoadNewSchedule(bool isForInterrupt)
                 // If we haven't already assessed this layout before, then check that it is valid
                 if (!validLayoutIds.Contains(layout.id))
                 {
-                    if (!ApplicationSettings.Default.ExpireModifiedLayouts && layout.id == CurrentLayoutId)
+                    if (!ApplicationSettings.Default.ExpireModifiedLayouts && layout.id == ClientInfo.Instance.CurrentLayoutId)
                     {
                         Trace.WriteLine(new LogMessage("ScheduleManager - LoadNewSchedule", "Skipping validity test for current layout."), LogType.Audit.ToString());
                     }
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index f21f1db2..caec5f6d 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -671,7 +671,7 @@ private void StartLayout(Layout layout)
             Debug.WriteLine("StartLayout: Started Layout", "MainWindow");
 
             // Update client info
-            ClientInfo.Instance.CurrentLayoutId = layout.ScheduleItem.id + "";
+            ClientInfo.Instance.CurrentLayoutId = layout.ScheduleItem.id;
             ClientInfo.Instance.CurrentlyPlaying = layout.ScheduleItem.layoutFile;
             ClientInfo.Instance.ControlCount = this.Scene.Children.Count;