Index: main/autoservice.c
===================================================================
--- main/autoservice.c	(revision 412304)
+++ main/autoservice.c	(working copy)
@@ -131,6 +131,9 @@
 
 		callid = ast_channel_callid(chan);
 		ast_callid_threadassoc_change(callid);
+		if (callid) {
+			callid = ast_callid_unref(callid);
+		}
 
 		f = ast_read(chan);
 
@@ -174,11 +177,6 @@
 		}
 	}
 
-	if (callid) {
-		ast_callid_threadassoc_remove();
-		callid = ast_callid_unref(callid);
-	}
-
 	asthread = AST_PTHREADT_NULL;
 
 	return NULL;