diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index a43baed9ae..a8fa5f4b4b 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2935,7 +2935,8 @@ void World::InitCurrencyResetTime()
 
     // generate time by config
     time_t curTime = time(NULL);
-    tm localTm = *localtime(&curTime);
+    tm localTm;
+    localtime_r(&curTime, &localTm);
 
     localTm.tm_wday = getIntConfig(CONFIG_CURRENCY_RESET_DAY);
     localTm.tm_hour = getIntConfig(CONFIG_CURRENCY_RESET_HOUR);
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index e06fbde868..e2428407c7 100644
--- a/src/server/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
@@ -280,7 +280,8 @@ public:
         // Format creation date
         char createdDateStr[20];
         time_t createdDate = guild->GetCreatedDate();
-        strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime(&createdDate));
+        tm localTm;
+        strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime_r(&createdDate, &localTm));
 
         handler->PSendSysMessage(LANG_GUILD_INFO_CREATION_DATE, createdDateStr); // Creation Date
         handler->PSendSysMessage(LANG_GUILD_INFO_MEMBER_COUNT, guild->GetMemberCount()); // Number of Members