diff --git a/client/main.lua b/client/main.lua
index 79743614..663b492d 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -1048,7 +1048,7 @@ function OpenPutWeaponMenu()
 
       ESX.TriggerServerCallback('esx_policejob:addArmoryWeapon', function()
         OpenPutWeaponMenu()
-      end, data.current.value)
+      end, data.current.value, true)
 
     end,
     function(data, menu)
@@ -1094,7 +1094,7 @@ function OpenBuyWeaponsMenu(station)
           if hasEnoughMoney then
             ESX.TriggerServerCallback('esx_policejob:addArmoryWeapon', function()
               OpenBuyWeaponsMenu(station)
-            end, data.current.value)
+            end, data.current.value, false)
           else
             ESX.ShowNotification(_U('not_enough_money'))
           end
diff --git a/server/main.lua b/server/main.lua
index 9a506265..d66eb4dd 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -362,11 +362,13 @@ ESX.RegisterServerCallback('esx_policejob:getArmoryWeapons', function(source, cb
 
 end)
 
-ESX.RegisterServerCallback('esx_policejob:addArmoryWeapon', function(source, cb, weaponName)
+ESX.RegisterServerCallback('esx_policejob:addArmoryWeapon', function(source, cb, weaponName, removeWeapon)
 
   local xPlayer = ESX.GetPlayerFromId(source)
 
-  xPlayer.removeWeapon(weaponName)
+  if removeWeapon then
+   xPlayer.removeWeapon(weaponName)
+  end
 
   TriggerEvent('esx_datastore:getSharedDataStore', 'society_police', function(store)