diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index fe6a36505..55817964b 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -612,6 +612,9 @@ void xf_SetWindowVisibilityRects(xfInfo* xfi, xfWindow* window, RECTANGLE_16* re
 
 void xf_DestroyWindow(xfInfo* xfi, xfWindow* window)
 {
+	if (window == NULL)
+		return;
+
 	if (window->gc)
 		XFreeGC(xfi->display, window->gc);