diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index 91d2792ff..c123806bf 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1053,13 +1053,12 @@ function widget.taglist.label.all(t, args)
     if sel and sel.tags[t] then
         background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarefw.png\""
     elseif bg_urgent and fg_urgent then
-        for k, c in pairs(capi.client.get()) do
-            if c.tags[t] then
-                background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarew.png\""
-                if c.urgent then
-                    bg_color = bg_urgent
-                    fg_color = fg_urgent
-                end
+        for k, c in pairs(t.clients) do
+            background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarew.png\""
+            if c.urgent then
+                bg_color = bg_urgent
+                fg_color = fg_urgent
+                break
             end
         end
     end