diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e15f40d2..f49404253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Fixed avatar icons not refreshing if they were changed on Steam (by @mexikoedi)
 - Fixed a wrong label for the sprint speed multiplier in the F1 menu (by @TimGoll)
 - Fixed own player name being shown in targetID when in vehicle (by @TimGoll)
+- Fixed `ShopEditor.BuildValidEquipmentCache()` being called too early on the client, resulting in a wrong cache state (by @NickCloudAT and @12problems)
 
 ### Removed
 
diff --git a/gamemodes/terrortown/gamemode/client/cl_changes.lua b/gamemodes/terrortown/gamemode/client/cl_changes.lua
index 1cd9a7c39..60f691bcd 100644
--- a/gamemodes/terrortown/gamemode/client/cl_changes.lua
+++ b/gamemodes/terrortown/gamemode/client/cl_changes.lua
@@ -2190,6 +2190,7 @@ function CreateChanges()
             <li>Avatar icons not refreshing if they were changed on Steam</li>
             <li>A wrong label for the sprint speed multiplier in the F1 menu</li>
             <li>Own player name being shown in targetID when in vehicle</li>
+            <li>Fixed <code>ShopEditor.BuildValidEquipmentCache()</code> being called too early on the client, resulting in a wrong cache state</li>
         </ul>
         <h2>Removed</h2>
         <ul>
diff --git a/gamemodes/terrortown/gamemode/client/cl_main.lua b/gamemodes/terrortown/gamemode/client/cl_main.lua
index 8880d88c3..c5abdc3f3 100644
--- a/gamemodes/terrortown/gamemode/client/cl_main.lua
+++ b/gamemodes/terrortown/gamemode/client/cl_main.lua
@@ -206,8 +206,6 @@ function GM:Initialize()
 
     keyhelp.InitializeBasicKeys()
 
-    ShopEditor.BuildValidEquipmentCache()
-
     tips.Initialize()
 
     ---
@@ -292,6 +290,8 @@ function GM:InitPostEntity()
     -- initialize fallback shops
     InitFallbackShops()
 
+    ShopEditor.BuildValidEquipmentCache()
+
     ---
     -- @realm client
     -- stylua: ignore