diff --git a/client.cpp b/client.cpp
index ab2a1b9d45..203839ec3a 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1628,7 +1628,8 @@ void Client::setCaption( const QString& _s, bool force )
 
         if( isManaged() && decoration != NULL )
             {
-            client_group->updateItems();
+            if (client_group)
+                client_group->updateItems();
             decoration->captionChange();
             }
         }