diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 215946baa..f4d3a59d5 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -1774,9 +1774,12 @@ namespace Barotrauma
             }
 
             if (Math.Sign(newStun) != Math.Sign(stunTimer)) AnimController.ResetPullJoints();
+
             stunTimer = newStun;
-                
-            selectedConstruction = null;
+            if (newStun > 0.0f)
+            {
+                selectedConstruction = null;
+            }
         }
 
         private void Implode(bool isNetworkMessage = false)