diff --git a/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
index 4a78467b..1fd4f522 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
@@ -135,7 +135,7 @@ public class WeatherGenerator(
     /// <param name="timestamp"> Optional, timestamp used </param>
     protected void SetCurrentDateTime(Weather weather, long? timestamp = null)
     {
-        var inRaidTime = _weatherHelper.GetInRaidTime(timestamp);
+        var inRaidTime = timestamp.HasValue ? _weatherHelper.GetInRaidTime() :  _weatherHelper.GetInRaidTime(timestamp.Value);
         var normalTime = GetBsgFormattedTime(inRaidTime);
         var formattedDate = _timeUtil.FormatDate(timestamp.HasValue ? _timeUtil.GetDateTimeFromTimeStamp(timestamp.Value) : DateTime.UtcNow);
         var datetimeBsgFormat = $"{formattedDate} {normalTime}";