diff --git a/components/WeaponGrid/index.tsx b/components/WeaponGrid/index.tsx
index c484ac41..0fe9c291 100644
--- a/components/WeaponGrid/index.tsx
+++ b/components/WeaponGrid/index.tsx
@@ -183,9 +183,6 @@ const WeaponGrid = (props: Props) => {
           position: position,
         })
         .then((response) => {
-          // Store new character in state
-          storeGridWeapon(response.data)
-
           // Remove conflicting characters from state
           conflicts.forEach((c) => {
             if (appState.grid.weapons.mainWeapon?.object.id === c.id) {
@@ -196,6 +193,9 @@ const WeaponGrid = (props: Props) => {
             }
           })
 
+          // Store new character in state
+          storeGridWeapon(response.data.grid_weapon)
+
           // Reset conflict
           resetConflict()