diff --git a/code/swb_base/WeaponBase.cs b/code/swb_base/WeaponBase.cs
index fbc27737..10e7a25a 100644
--- a/code/swb_base/WeaponBase.cs
+++ b/code/swb_base/WeaponBase.cs
@@ -69,6 +69,7 @@ public override void ActiveEnd(Entity ent, bool dropped)
     {
         // Attachments
         HandleAttachments(false);
+        wasZooming = false;
 
         base.ActiveEnd(ent, dropped);
     }
diff --git a/code/swb_base/attachments/BodyGroupSight.HunterScope2D.cs b/code/swb_base/attachments/BodyGroupSight.HunterScope2D.cs
index a3ae8828..c6ed0cbb 100644
--- a/code/swb_base/attachments/BodyGroupSight.HunterScope2D.cs
+++ b/code/swb_base/attachments/BodyGroupSight.HunterScope2D.cs
@@ -27,6 +27,12 @@ public class HunterScope2D : BodyGroupSight
         "100% accurate while scoped in"
     };
 
+    public override void OnUnequip(WeaponBase weapon)
+    {
+        base.OnUnequip(weapon);
+        OnZoomEnd(weapon);
+    }
+
     public override void OnZoomStart(WeaponBase weapon)
     {
         WeaponBaseSniper.OnScopeStart(weapon, ZoomInSound, ZoomInDelay);