diff --git a/client.cpp b/client.cpp
index d1725b7612..f325699c55 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1710,6 +1710,8 @@ void Client::getMotifHints()
 {
     const bool wasClosable = m_motif.close();
     const bool wasNoBorder = m_motif.noBorder();
+    if (m_managed) // only on property change, initial read is prefetched
+        m_motif.fetch();
     m_motif.read();
     if (m_motif.hasDecoration() && m_motif.noBorder() != wasNoBorder) {
         // If we just got a hint telling us to hide decorations, we do so.
diff --git a/events.cpp b/events.cpp
index 5baab1fb1a..70dd572715 100644
--- a/events.cpp
+++ b/events.cpp
@@ -909,7 +909,6 @@ void Client::propertyNotifyEvent(xcb_property_notify_event_t *e)
         break;
     default:
         if (e->atom == atoms->motif_wm_hints) {
-            m_motif.fetch();
             getMotifHints();
         } else if (e->atom == atoms->net_wm_sync_request_counter)
             getSyncCounter();