diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
index 341811f9..dd75b36a 100644
--- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
+++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
@@ -1501,7 +1501,7 @@ DWORD WINAPI WinsockNetLayer::DiscoveryThreadProc(LPVOID param)
 		char senderIP[64];
 		inet_ntop(AF_INET, &senderAddr.sin_addr, senderIP, sizeof(senderIP));
 
-		DWORD now = GetTickCount();
+		DWORD64 now = GetTickCount64();
 
 		EnterCriticalSection(&s_discoveryLock);
 
diff --git a/Minecraft.Client/Windows64/Windows64_Xuid.h b/Minecraft.Client/Windows64/Windows64_Xuid.h
index f5fd62b9..6348d2db 100644
--- a/Minecraft.Client/Windows64/Windows64_Xuid.h
+++ b/Minecraft.Client/Windows64/Windows64_Xuid.h
@@ -162,7 +162,7 @@ namespace Win64Xuid
 		seed ^= (uint64_t)qpc.QuadPart;
 		seed ^= ((uint64_t)GetCurrentProcessId() << 32);
 		seed ^= (uint64_t)GetCurrentThreadId();
-		seed ^= (uint64_t)GetTickCount();
+		seed ^= (uint64_t)GetTickCount64();
 		seed ^= (uint64_t)(size_t)&qpc;
 		seed ^= (uint64_t)(size_t)GetModuleHandleA(NULL);
 
diff --git a/Minecraft.Server/Windows64/ServerMain.cpp b/Minecraft.Server/Windows64/ServerMain.cpp
index d6abf144..5692803c 100644
--- a/Minecraft.Server/Windows64/ServerMain.cpp
+++ b/Minecraft.Server/Windows64/ServerMain.cpp
@@ -641,7 +641,7 @@ int main(int argc, char **argv)
 	{
 		autosaveIntervalMs = (DWORD)(serverProperties.autosaveIntervalSeconds * 1000);
 	}
-	DWORD nextAutosaveTick = GetTickCount() + autosaveIntervalMs;
+	DWORD64 nextAutosaveTick = GetTickCount64() + autosaveIntervalMs;
 	bool autosaveRequested = false;
 	ServerRuntime::ServerCli serverCli;
 	serverCli.Start();
@@ -668,7 +668,7 @@ int main(int argc, char **argv)
 			break;
 		}
 
-		DWORD now = GetTickCount();
+		DWORD64 now = GetTickCount64();
 		if ((LONG)(now - nextAutosaveTick) >= 0)
 		{
 			if (app.GetXuiServerAction(kServerActionPad) == eXuiServerAction_Idle && !ConsoleSaveFileOriginal::hasPendingBackgroundSave())
diff --git a/Minecraft.Server/WorldManager.cpp b/Minecraft.Server/WorldManager.cpp
index ee8696a7..a18641aa 100644
--- a/Minecraft.Server/WorldManager.cpp
+++ b/Minecraft.Server/WorldManager.cpp
@@ -226,10 +226,10 @@ static int LoadSaveDataCallbackProc(LPVOID lpParam, const bool bIsCorrupt, const
  *
  * @return `true` when completion is detected
  */
-static bool WaitForSaveInfoResult(SaveInfoQueryContext *context, DWORD timeoutMs, WorldManagerTickProc tickProc)
+static bool WaitForSaveInfoResult(SaveInfoQueryContext *context, DWORD64 timeoutMs, WorldManagerTickProc tickProc)
 {
-	DWORD start = GetTickCount();
-	while ((GetTickCount() - start) < timeoutMs)
+	DWORD64 start = GetTickCount64();
+	while ((GetTickCount64() - start) < timeoutMs)
 	{
 		if (context->done)
 		{
@@ -268,10 +268,10 @@ static bool WaitForSaveInfoResult(SaveInfoQueryContext *context, DWORD timeoutMs
  *
  * @return `true` when callback is reached, `false` on timeout
  */
-static bool WaitForSaveLoadResult(SaveDataLoadContext *context, DWORD timeoutMs, WorldManagerTickProc tickProc)
+static bool WaitForSaveLoadResult(SaveDataLoadContext *context, DWORD64 timeoutMs, WorldManagerTickProc tickProc)
 {
-	DWORD start = GetTickCount();
-	while ((GetTickCount() - start) < timeoutMs)
+	DWORD64 start = GetTickCount64();
+	while ((GetTickCount64() - start) < timeoutMs)
 	{
 		if (context->done)
 		{
@@ -612,11 +612,11 @@ WorldBootstrapResult BootstrapWorldForServer(
  */
 bool WaitForWorldActionIdle(
 	int actionPad,
-	DWORD timeoutMs,
+	DWORD64 timeoutMs,
 	WorldManagerTickProc tickProc,
 	WorldManagerHandleActionsProc handleActionsProc)
 {
-	DWORD start = GetTickCount();
+	DWORD64 start = GetTickCount64();
 	while (app.GetXuiServerAction(actionPad) != eXuiServerAction_Idle && !MinecraftServer::serverHalted())
 	{
 		// Keep network and storage progressing while waiting
@@ -629,7 +629,7 @@ bool WaitForWorldActionIdle(
 		{
 			handleActionsProc();
 		}
-		if ((GetTickCount() - start) >= timeoutMs)
+		if ((GetTickCount64() - start) >= timeoutMs)
 		{
 			return false;
 		}
diff --git a/Minecraft.World/system.cpp b/Minecraft.World/system.cpp
index 71d0a85e..3103d6d3 100644
--- a/Minecraft.World/system.cpp
+++ b/Minecraft.World/system.cpp
@@ -66,7 +66,7 @@ int64_t System::nanoTime()
 	// Precision is sufficient for ~100 days of uptime.
 	return static_cast<int64_t>(static_cast<double>(counter.QuadPart) * 1000000000.0 / static_cast<double>(s_frequency.QuadPart));
 #else
-	return GetTickCount() * 1000000LL;
+	return GetTickCount64() * 1000000LL;
 #endif
 }