diff --git a/apps/app_queue.c b/apps/app_queue.c
index b449263c9b..ac4738fd27 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -8166,6 +8166,9 @@ stop:
 			} else if (qcontinue) {
 				reason = QUEUE_CONTINUE;
 				res = 0;
+			} else if (reason == QUEUE_LEAVEEMPTY) {
+				/* Return back to dialplan, don't hang up */
+				res = 0;
 			}
 		} else if (qe.valid_digits) {
 			ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY",