diff --git a/rehlds/engine/cmd.cpp b/rehlds/engine/cmd.cpp
index 2022e1c..82a2ffc 100644
--- a/rehlds/engine/cmd.cpp
+++ b/rehlds/engine/cmd.cpp
@@ -458,8 +458,9 @@ void Cmd_Alias_f(void)
 		return;
 	}
 
-	SetCStrikeFlags();	// TODO: Do this once somewhere at the server start
-
+#ifndef REHLDS_FIXES
+	SetCStrikeFlags();	// DONE: Do this once somewhere at the server start
+#endif
 	if ((g_bIsCStrike || g_bIsCZero) &&
 		(!Q_stricmp(s, "cl_autobuy")
 		|| !Q_stricmp(s, "cl_rebuy")
diff --git a/rehlds/engine/host_cmd.cpp b/rehlds/engine/host_cmd.cpp
index 3bf96c6..4bd29a1 100644
--- a/rehlds/engine/host_cmd.cpp
+++ b/rehlds/engine/host_cmd.cpp
@@ -219,6 +219,10 @@ void Host_InitializeGameDLL(void)
 	SV_CheckBlendingInterface();
 	SV_CheckSaveGameCommentInterface();
 	Cbuf_Execute();
+
+#ifdef REHLDS_FIXES // DONE: Set cstrike flags on server start
+		SetCStrikeFlags();
+#endif
 }
 
 void Host_Motd_f(void)
diff --git a/rehlds/engine/model.cpp b/rehlds/engine/model.cpp
index 31fe4ce..c6283fc 100644
--- a/rehlds/engine/model.cpp
+++ b/rehlds/engine/model.cpp
@@ -310,8 +310,9 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC)
 			{
 				p->firstCRCDone = 1;
 				p->initialCRC = currentCRC;
+#ifndef REHLDS_FIXES
 				SetCStrikeFlags();
-
+#endif
 				if (!IsGameSubscribed("czero") && g_bIsCStrike && IsCZPlayerModel(currentCRC, mod->name) && g_pcls.state)
 				{
 					COM_ExplainDisconnection(TRUE, "Cannot continue with altered model %s, disconnecting.", mod->name);
diff --git a/rehlds/engine/sv_main.cpp b/rehlds/engine/sv_main.cpp
index 0dd0ada..7661635 100644
--- a/rehlds/engine/sv_main.cpp
+++ b/rehlds/engine/sv_main.cpp
@@ -5746,7 +5746,9 @@ void EXT_FUNC SV_ActivateServer_internal(int runPhysics)
 	msg.cursize = 0;
 	msg.flags = SIZEBUF_CHECK_OVERFLOW;
 
+#ifndef REHLDS_FIXES
 	SetCStrikeFlags();
+#endif
 	Cvar_Set("sv_newunit", "0");
 
 	ContinueLoadingProgressBar("Server", 8, 0.0f);
@@ -8044,4 +8046,4 @@ NOXREF qboolean BIsValveGame(void)
 			return TRUE;
 	}
 	return FALSE;
-}
\ No newline at end of file
+}