diff --git a/xorg/server/module/rdpClientCon.c b/xorg/server/module/rdpClientCon.c
index e375b4e2..24870557 100644
--- a/xorg/server/module/rdpClientCon.c
+++ b/xorg/server/module/rdpClientCon.c
@@ -259,6 +259,11 @@ rdpClientConDisconnect(rdpPtr dev, rdpClientCon *clientCon)
     }
     rdpRegionDestroy(clientCon->dirtyRegion);
     rdpRegionDestroy(clientCon->shmRegion);
+    if (clientCon->updateTimer != NULL)
+    {
+        TimerCancel(clientCon->updateTimer);
+        TimerFree(clientCon->updateTimer);
+    }
     g_free(clientCon);
     return 0;
 }