diff --git a/src/server/clientComponents/inventory.js b/src/server/clientComponents/inventory.js
index 214e01fb..1f6aa504 100644
--- a/src/server/clientComponents/inventory.js
+++ b/src/server/clientComponents/inventory.js
@@ -45,6 +45,10 @@ define([
 						);
 					}
 
+					Object.getOwnPropertyNames(findItem).forEach(p => {
+						delete findItem[p];
+					});
+
 					Object.assign(findItem, g);
 				});
 
diff --git a/src/server/components/equipment.js b/src/server/components/equipment.js
index 007f1626..9a36fb3d 100644
--- a/src/server/components/equipment.js
+++ b/src/server/components/equipment.js
@@ -145,7 +145,7 @@ module.exports = {
 		if (typeof(item) !== 'object' || !item.has('id'))
 			item = inventory.findItem(itemId);
 
-		if (!item)
+		if (!item || !item.eq)
 			return;
 		else if (!ignoreSpaceCheck && !inventory.hasSpace()) {
 			const message = 'You do not have room in your inventory to unequip that item';