diff --git a/lib/awful/tag.lua b/lib/awful/tag.lua
index b24860b48..9d04ba4d8 100644
--- a/lib/awful/tag.lua
+++ b/lib/awful/tag.lua
@@ -848,9 +848,7 @@ capi.tag.add_signal("property::urgent")
 capi.tag.add_signal("property::urgent_count")
 
 capi.screen.add_signal("tag::history::update")
-for s = 1, capi.screen.count() do
-    capi.screen[s]:connect_signal("tag::history::update", tag.history.update)
-end
+capi.screen.connect_signal("tag::history::update", tag.history.update)
 
 function tag.mt:__call(...)
     return tag.new(...)