diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
index 854404e0e..d65a27d2e 100644
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@@ -1554,6 +1554,7 @@ static BOOL handle_window_events(freerdp* instance)
 	if (!xf_process_x_events(instance))
 	{
 		WLog_DBG(TAG, "Closed from X11");
+		freerdp_abort_connect_context(instance->context);
 		return FALSE;
 	}