diff --git a/ATxCommon/StorageStatus.cs b/ATxCommon/StorageStatus.cs
index c70a9fbc880eb71c0c1ab48adbb842d49f892c4b..3156e3453edb9ea26a072d032d3d582b98e1e9d6 100644
--- a/ATxCommon/StorageStatus.cs
+++ b/ATxCommon/StorageStatus.cs
@@ -177,13 +177,12 @@ namespace ATxCommon
                 if (expired.Count > 0)
                     _expiredDirs.Add(userdir.Name, expired);
             }
+            _lastUpdateGraceLocation = DateTime.Now;
 
-            if (ExpiredDirsCount > 0) {
+            if (_expiredDirs.Count > 0) {
                 Log.Debug("Updated storage status: {0} expired directories in grace location.",
-                    ExpiredDirsCount);
+                    _expiredDirs.Count);
             }
-
-            _lastUpdateGraceLocation = DateTime.Now;
         }
 
         /// <summary>