diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 821ef965d0..0d0422efa0 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -149,7 +149,7 @@ gdk_x11_window_invalidate_for_new_frame (GdkWindow      *window,
 
 
   invalidate_all = FALSE;
-  if (buffer_age == 0 || buffer_age >= 4)
+  if (buffer_age >= 4)
     {
       cairo_rectangle_int_t whole_window = { 0, 0, gdk_window_get_width (window), gdk_window_get_height (window) };
 
@@ -163,6 +163,10 @@ gdk_x11_window_invalidate_for_new_frame (GdkWindow      *window,
     }
   else
     {
+      if (buffer_age == 0)
+        {
+          invalidate_all = TRUE;
+        }
       if (buffer_age >= 2)
         {
           if (window->old_updated_area[0])