diff --git a/components/party/Party/index.tsx b/components/party/Party/index.tsx
index d6837cd4..49047ef6 100644
--- a/components/party/Party/index.tsx
+++ b/components/party/Party/index.tsx
@@ -340,8 +340,11 @@ const Party = (props: Props) => {
       if (gridObject.mainhand) {
         appState.grid.weapons.mainWeapon = gridObject
         appState.party.element = gridObject.object.element
-      } else if (!gridObject.mainhand && gridObject.position != null) {
-        appState.grid.weapons.allWeapons[gridObject.position] = gridObject
+      } else if (!gridObject.mainhand && gridObject.position !== null) {
+        let weapon = clonedeep(gridObject)
+        weapon.element = gridObject.object.element
+
+        appState.grid.weapons.allWeapons[gridObject.position] = weapon
       }
     })
   }