diff --git a/tag.c b/tag.c
index 9fce6c956..2ec720127 100644
--- a/tag.c
+++ b/tag.c
@@ -77,7 +77,10 @@ untag_client(Client *c, Tag *t)
 
     for(tc = globalconf.tclink; tc; tc = tc->next)
         if(tc->client == c && tc->tag == t)
+        {
             detach_tagclientlink(tc);
+            break;
+        }
 }
 
 Bool