diff --git a/lib/awful/placement.lua b/lib/awful/placement.lua
index c7599e8ae..32ebd8463 100644
--- a/lib/awful/placement.lua
+++ b/lib/awful/placement.lua
@@ -184,6 +184,10 @@ local function compose(...)
             attach(d, ret, args)
         end
 
+        -- Cleanup the override because otherwise it might leak into
+        -- future calls.
+        rawset(args, "override_geometry", nil)
+
         return last_geo, rets
     end, "compose")