diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 4c9029cf8..59e49d0c7 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -94,6 +94,8 @@ struct GLWindowingData
     DC = NULL;
     ctx = NULL;
     wnd = NULL;
+    egl_wnd = NULL;
+    egl_cfg = NULL;
   }
 
   union
@@ -144,7 +146,9 @@ struct GLWindowingData
   {
     dpy = NULL;
     ctx = NULL;
-    wnd = 0;
+    wnd = (GLWindowPtr)NULL;
+    egl_wnd = (GLESWindowPtr)NULL;
+    cfg = NULL;
   }
 
 #if defined(RENDERDOC_SUPPORT_GL)
@@ -222,6 +226,7 @@ struct GLWindowingData
     egl_dpy = NULL;
     wnd = NULL;
     egl_wnd = NULL;
+    egl_cfg = NULL;
   }
 
   union