diff --git a/common/in_x11.c b/common/in_x11.c
index e333df4..3572f38 100644
--- a/common/in_x11.c
+++ b/common/in_x11.c
@@ -89,6 +89,7 @@ void IN_Shutdown(void)
 	if (x_disp) {
 		XAutoRepeatOn(x_disp);
 		XCloseDisplay(x_disp);
+		x_disp = 0;
 	}
 }
 
diff --git a/common/vid_x11.c b/common/vid_x11.c
index 589b6b7..6055250 100644
--- a/common/vid_x11.c
+++ b/common/vid_x11.c
@@ -749,6 +749,7 @@ VID_Shutdown(void)
 	if (x_disp) {
 		XAutoRepeatOn(x_disp);
 		XCloseDisplay(x_disp);
+		x_disp = 0;
 	}
 }