diff --git a/src/libguac/client-handlers.c b/src/libguac/client-handlers.c
index a9e1326b..a92ddf1d 100644
--- a/src/libguac/client-handlers.c
+++ b/src/libguac/client-handlers.c
@@ -317,7 +317,8 @@ int __guac_handle_end(guac_client* client, guac_instruction* instruction) {
 }
 
 int __guac_handle_disconnect(guac_client* client, guac_instruction* instruction) {
-    /* Return error code to force disconnect */
-    return -1;
+    guac_client_log_info(client, "Disconnect requested. Stopping client...");
+    guac_client_stop(client);
+    return 0;
 }