diff --git a/main/autoservice.c b/main/autoservice.c
index 568cf1070a..bb0791fcac 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -81,8 +81,11 @@ static void *autoservice_run(void *ign)
 		if ((chan = ast_waitfor_n(mons, x, &ms))) {
 			struct ast_frame *f = ast_read(chan);
 	
-			if (!f)
+			if (!f) {
+				/* NULL means we got a hangup*/
+				ast_queue_hangup(chan);
 				continue;
+			}
 			
 			/* Do not add a default entry in this switch statement.  Each new
 			 * frame type should be addressed directly as to whether it should