diff --git a/lua/weapons/disguiser/init.lua b/lua/weapons/disguiser/init.lua
index cf7e237..4baff79 100644
--- a/lua/weapons/disguiser/init.lua
+++ b/lua/weapons/disguiser/init.lua
@@ -384,3 +384,8 @@ end
 function SWEP:GetPropConfig(name)
 	return self.PropConfiguration[name] or {}
 end
+
+function SWEP:OnRemove()
+	// Do you want to get stuck as a prop forever? NO.
+	self:Undisguise()
+end
diff --git a/lua/weapons/disguiser/sh_init.lua b/lua/weapons/disguiser/sh_init.lua
index 552fffa..ed5d855 100644
--- a/lua/weapons/disguiser/sh_init.lua
+++ b/lua/weapons/disguiser/sh_init.lua
@@ -149,11 +149,6 @@ function SWEP:DoShootEffect(hitpos, hitnormal, entity, physbone, bFirstTimePredi
 
 end
 
-function SWEP:OnRemove()
-	// Do you want to get stuck as a prop forever? NO.
-	self:Undisguise()
-end
-
 function SWEP:PreDrawViewModel(vm, ply, wep)
 	if self.Owner:GetNWBool("isDisguised", false) then
 		vm:SetRenderMode(RENDERMODE_TRANSALPHA)