diff --git a/fxmanifest.lua b/fxmanifest.lua
index 55ba99fc05..0f594c02ca 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -7,7 +7,7 @@ game         'gta5'
 --[[ Resource Information ]]--
 name         'ox_inventory'
 author       'Overextended'
-version      '2.8.4'
+version      '2.8.5'
 repository   'https://github.com/overextended/ox_inventory'
 description  'What even is an "ESX.Items" anyway?'
 
diff --git a/modules/shops/server.lua b/modules/shops/server.lua
index 9723583b20..20e77f2b40 100644
--- a/modules/shops/server.lua
+++ b/modules/shops/server.lua
@@ -23,7 +23,14 @@ for shopName, shopDetails in pairs(data('shops')) do
 			}
 			for j = 1, Shops[shopName][i].slots do
 				local slot = Shops[shopName][i].items[j]
+
+				if slot.grade and not shopDetails.groups then
+					print(('^1attempted to restrict slot %s (%s) to grade %s, but %s has no job restriction^0'):format(i, slot.name, slot.grade, shopDetails.name))
+					slot.grade = nil
+				end
+
 				local Item = Items(slot.name)
+
 				if Item then
 					slot = {
 						name = Item.name,
@@ -51,7 +58,14 @@ for shopName, shopDetails in pairs(data('shops')) do
 		}
 		for i = 1, Shops[shopName].slots do
 			local slot = Shops[shopName].items[i]
+
+			if slot.grade and not shopDetails.groups then
+				print(('^1attempted to restrict slot %s (%s) to grade %s, but %s has no job restriction^0'):format(i, slot.name, slot.grade, shopDetails.name))
+				slot.grade = nil
+			end
+
 			local Item = Items(slot.name)
+
 			if Item then
 				slot = {
 					name = Item.name,