diff --git a/main.h b/main.h
index 6706c0faf5..cdbabec95c 100644
--- a/main.h
+++ b/main.h
@@ -109,7 +109,7 @@ public:
         Always
     };
     void setX11Time(xcb_timestamp_t timestamp, TimestampUpdate force = TimestampUpdate::OnlyIfLarger) {
-        if (timestamp > m_x11Time || force == TimestampUpdate::Always) {
+        if ((timestamp > m_x11Time || force == TimestampUpdate::Always) && timestamp != 0) {
             m_x11Time = timestamp;
         }
     }