diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
index 367e47a169..51fc34e1ba 100644
--- a/Client/game_sa/CGameSA.cpp
+++ b/Client/game_sa/CGameSA.cpp
@@ -69,6 +69,10 @@ unsigned int OBJECTDYNAMICINFO_MAX = *(uint32_t*)0x59FB4C != 0x90909090 ? *(uint
 CGameSA::CGameSA()
 {
     pGame = this;
+
+    // Find the game version and initialize m_eGameVersion so GetGameVersion() will return the correct value
+    FindGameVersion();
+
     m_bAsyncScriptEnabled = false;
     m_bAsyncScriptForced = false;
     m_bASyncLoadingSuspended = false;
diff --git a/Client/game_sa/CRenderWareSA.ShaderSupport.cpp b/Client/game_sa/CRenderWareSA.ShaderSupport.cpp
index e5cb96cd95..2481ea1f0d 100644
--- a/Client/game_sa/CRenderWareSA.ShaderSupport.cpp
+++ b/Client/game_sa/CRenderWareSA.ShaderSupport.cpp
@@ -643,8 +643,6 @@ void CRenderWareSA::SetGTAVertexShadersEnabled(bool bEnable)
     m_bGTAVertexShadersEnabled = bEnable;
 
     DWORD pSkinAtomic = 0x07C7CD0;
-    if (pGame->GetGameVersion() != VERSION_US_10)
-        pSkinAtomic = 0x07C7D10;
 
     if (bEnable)
     {