diff --git a/protocols/rdp/src/rdp_client.c b/protocols/rdp/src/rdp_client.c
index c18260ce..9e435189 100644
--- a/protocols/rdp/src/rdp_client.c
+++ b/protocols/rdp/src/rdp_client.c
@@ -234,7 +234,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
     }
     guac_client_data->rdp_inst = rdp_inst;
     guac_client_data->mouse_button_mask = 0;
-    guac_client_data->current_surface = client->default_layer;
+    guac_client_data->current_surface = GUAC_DEFAULT_LAYER;
 
 
     /* Store client data */
diff --git a/protocols/rdp/src/rdp_handlers.c b/protocols/rdp/src/rdp_handlers.c
index 5d0a83c9..76e31b6a 100644
--- a/protocols/rdp/src/rdp_handlers.c
+++ b/protocols/rdp/src/rdp_handlers.c
@@ -403,7 +403,7 @@ void guac_rdp_ui_screenblt(rdpInst* inst, uint8 opcode, int x, int y, int cx, in
     GUACIO* io = client->io;
 
     guac_send_copy(io,
-            client->default_layer, srcx, srcy, cx, cy,
+            GUAC_DEFAULT_LAYER, srcx, srcy, cx, cy,
             GUAC_COMP_OVER, current_surface, x, y);
 
 }
@@ -596,7 +596,7 @@ void guac_rdp_ui_set_surface(rdpInst* inst, RD_HBITMAP surface) {
         guac_send_size(io, inst->settings->width, inst->settings->height);
         guac_flush(io);
 
-        guac_client_data->current_surface = client->default_layer;
+        guac_client_data->current_surface = GUAC_DEFAULT_LAYER;
     }
     else {
         guac_client_data->current_surface = surface;