diff --git a/lua/weapons/disguiser/init.lua b/lua/weapons/disguiser/init.lua
index 0255870..94e033a 100644
--- a/lua/weapons/disguiser/init.lua
+++ b/lua/weapons/disguiser/init.lua
@@ -175,6 +175,7 @@ function SWEP:Disguise(entity)
 	owner:EmitSound("Disguiser.Disguise")
 	
 	// We're now disguised!
+	victim:SetNetworkedBool("isDisguised", true)
 	self.DisguisedAs = entity:GetModel()
 	owner.Disguised = true
 	
@@ -228,6 +229,7 @@ function SWEP:Undisguise()
 	owner:EmitSound("Disguiser.Undisguise")
 	
 	// We're no longer disguised
+	victim:SetNetworkedBool("isDisguised", false)
 	self:DisableThirdPerson(owner)
 	owner:DrawViewModel(true)
 	owner:DrawWorldModel(true)
@@ -331,6 +333,7 @@ end
 hook.Add("PlayerDeath", "Disguiser.ThirdPersonDeath", function(victim, inflictor, killer)
 
 	victim:SetNetworkedBool("thirdperson", false)
+	victim:SetNetworkedBool("isDisguised", false)
 	local ventity = victim:GetViewEntity()
 	
 	// Escape third-person mode
diff --git a/lua/weapons/disguiser/sh_init.lua b/lua/weapons/disguiser/sh_init.lua
index 1a271be..8a5eaca 100644
--- a/lua/weapons/disguiser/sh_init.lua
+++ b/lua/weapons/disguiser/sh_init.lua
@@ -150,6 +150,8 @@ function SWEP:DoShootEffect(hitpos, hitnormal, entity, physbone, bFirstTimePredi
 end
 
 function SWEP:Deploy()
-	self.Owner:DrawViewModel(!self.DisguisedAs)
-	if SERVER then self.Owner:DrawWorldModel(!self.DisguisedAs) end
+	self.Owner:DrawViewModel(!self.Owner:GetNWBool("isDisguised", false))
+	if !!self.Owner:DrawWorldModel then
+		self.Owner:DrawWorldModel(!self.Owner:GetNWBool("isDisguised", false))
+	end
 end
\ No newline at end of file