diff --git a/kitty/state.c b/kitty/state.c
index 83b6a62ea..6e5e5ea45 100644
--- a/kitty/state.c
+++ b/kitty/state.c
@@ -156,8 +156,10 @@ create_gpu_resources_for_window(Window *w) {
 
 static inline void
 release_gpu_resources_for_window(Window *w) {
-    remove_vao(w->render_data.vao_idx); remove_vao(w->render_data.gvao_idx);
-    w->render_data.vao_idx = 0; w->render_data.gvao_idx = 0;
+    if (w->render_data.vao_idx > -1) remove_vao(w->render_data.vao_idx);
+    w->render_data.vao_idx = -1;
+    if (w->render_data.gvao_idx > -1) remove_vao(w->render_data.gvao_idx);
+    w->render_data.gvao_idx = -1;
 }