diff --git a/src/protocols/rdp/gdi.c b/src/protocols/rdp/gdi.c
index 69373faf9..5956df23c 100644
--- a/src/protocols/rdp/gdi.c
+++ b/src/protocols/rdp/gdi.c
@@ -99,7 +99,10 @@ BOOL guac_rdp_gdi_end_paint(rdpContext* context) {
 
     guac_display_layer* default_layer = guac_display_default_layer(rdp_client->display);
     guac_display_layer_raw_context* current_context = rdp_client->current_context;
-    GUAC_ASSERT(current_context != NULL);
+
+    /* Handle the case where EndPaint was called without BeginPaint */
+    if (current_context == NULL)
+        return TRUE;
 
     /* Ignore paint if GDI output is suppressed */
     if (gdi->suppressOutput)