Index: apps/app_queue.c
===================================================================
--- apps/app_queue.c	(revision 89442)
+++ apps/app_queue.c	(working copy)
@@ -5515,9 +5515,7 @@
 	if (device_state_sub)
 		ast_event_unsubscribe(device_state_sub);
 
-	if ((con = ast_context_find("app_queue_gosub_virtual_context"))) {
-		ast_context_remove_extension2(con, "s", 1, NULL);
-	}
+	ast_context_destroy(NULL, "app_queue");
 
 	clear_and_free_interfaces();