diff --git a/client.c b/client.c
index 54670da4..e1793de3 100644
--- a/client.c
+++ b/client.c
@@ -615,7 +615,8 @@ client_updatewmhints(Client *c)
 
     if((wmh = XGetWMHints(globalconf.display, c->win)))
     {
-        c->isurgent = (wmh->flags & XUrgencyHint);
+        if((c->isurgent = (wmh->flags & XUrgencyHint)))
+            widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS);
         if((wmh->flags & StateHint) && wmh->initial_state == WithdrawnState)
             c->skip = True;
         XFree(wmh);
diff --git a/event.c b/event.c
index 7ad67c75..dba6302a 100644
--- a/event.c
+++ b/event.c
@@ -376,7 +376,6 @@ handle_event_propertynotify(XEvent * e)
             break;
           case XA_WM_HINTS:
             client_updatewmhints(c);
-            widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS);
             break;
         }
         if(ev->atom == XA_WM_NAME || ev->atom == XInternAtom(globalconf.display, "_NET_WM_NAME", False))