diff --git a/GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs b/GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs
index 85db1aebd..1c18161a7 100644
--- a/GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs
+++ b/GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs
@@ -75,7 +75,10 @@ namespace GenesisCordonelInterface.API
         #endregion
 
         #region ================================== MeterBatch Debug ==================================
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
         public List<MeterBatchDebugStatus> GetMeterBatchDebugStatuses()
         {
             List<GenesisMeter> meters;
@@ -942,9 +945,17 @@ namespace GenesisCordonelInterface.API
 
                 var meter = GetMeterThreadSafe(slot);
 
-                meter.Logout();
+                bool logoutSuccess = meter.Logout();
                 meter.Disconnect();
 
+                if (meter.IsLoggedOn)
+                {
+                    meter.MarkLoggedOut();
+                    meter.LastLogoutStatus = logoutSuccess
+                        ? "Successfully logged out"
+                        : "Logout failed, but connection was closed";
+                }
+
                 bool success = !meter.IsConnected && !meter.IsLoggedOn;
 
                 if (success)