diff --git a/Libraries/Core/Helpers/HideoutHelper.cs b/Libraries/Core/Helpers/HideoutHelper.cs
index f65ef00f..7634edc3 100644
--- a/Libraries/Core/Helpers/HideoutHelper.cs
+++ b/Libraries/Core/Helpers/HideoutHelper.cs
@@ -222,6 +222,8 @@ public class HideoutHelper(
     {
         var pmcData = _profileHelper.GetPmcProfile(sessionID);
         var hideoutProperties = GetHideoutProperties(pmcData);
+        
+        pmcData.Hideout.SptUpdateLastRunTimestamp ??= _timeUtil.GetTimeStamp();
 
         UpdateAreasWithResources(sessionID, pmcData, hideoutProperties);
         UpdateProductionTimers(pmcData, hideoutProperties);
diff --git a/Libraries/Core/Services/ProfileActivityService.cs b/Libraries/Core/Services/ProfileActivityService.cs
index 54acd454..aee988bf 100644
--- a/Libraries/Core/Services/ProfileActivityService.cs
+++ b/Libraries/Core/Services/ProfileActivityService.cs
@@ -19,9 +19,7 @@ public class ProfileActivityService(
     public bool ActiveWithinLastMinutes(string sessionId, int minutes)
     {
         var currentTimestamp = _timeUtil.GetTimeStamp();
-        var storedActivityTimestamp = profileActivityTimestamps.GetValueOrDefault(sessionId);
-
-        if (storedActivityTimestamp != null)
+        if (!profileActivityTimestamps.TryGetValue(sessionId, out var storedActivityTimestamp))
             return false;
 
         return currentTimestamp - storedActivityTimestamp < minutes * 60;