diff --git a/tdekbdledsync/main.cpp b/tdekbdledsync/main.cpp
index a439ebd41..ccbb66b84 100644
--- a/tdekbdledsync/main.cpp
+++ b/tdekbdledsync/main.cpp
@@ -440,6 +440,11 @@ int main() {
 						}
 					}
 				}
+				else {
+					// Ensure the X server is still alive
+					// If the X server has terminated, this will fail and the program will terminate
+					XSync(display, False);
+				}
 
 				// Check the hotplug monitoring process to see if any keyboards were added or removed
 				fd_set readfds;