diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs
index 9b34ea58c6..ba43055792 100644
--- a/Content.Server/Cuffs/Components/CuffableComponent.cs
+++ b/Content.Server/Cuffs/Components/CuffableComponent.cs
@@ -227,6 +227,7 @@ namespace Content.Server.Cuffs.Components
             var doAfterEventArgs = new DoAfterEventArgs(user, uncuffTime)
             {
                 BreakOnUserMove = true,
+                BreakOnTargetMove = true,
                 BreakOnDamage = true,
                 BreakOnStun = true,
                 NeedHand = true
diff --git a/Content.Server/Cuffs/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs
index 213f07d1c9..a92a921ffd 100644
--- a/Content.Server/Cuffs/CuffableSystem.cs
+++ b/Content.Server/Cuffs/CuffableSystem.cs
@@ -73,8 +73,7 @@ namespace Content.Server.Cuffs
                 }
                 else
                 {
-                    // Uh... let it go through???
-                    // TODO CUFFABLE/STUN add UncuffAttemptEvent subscription to StunSystem
+                    // TODO Find a way for cuffable to check ActionBlockerSystem.CanInteract() without blocking itself
                 }
             }
             else