diff --git a/src/core/window.c b/src/core/window.c
index b135834a7..7b5e556da 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5208,6 +5208,16 @@ meta_window_client_message (MetaWindow *window,
 
   display = window->display;
 
+  if (window->override_redirect)
+    {
+      /* Don't warn here: we could warn on any of the messages below,
+       * but we might also receive other client messages that are
+       * part of protocols we don't know anything about. So, silently
+       * ignoring is simplest.
+       */
+      return FALSE;
+    }
+
   if (event->xclient.message_type ==
       display->atom__NET_CLOSE_WINDOW)
     {