diff --git a/main/autoservice.c b/main/autoservice.c
index 5b0c722efd..1590c8537a 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -131,6 +131,9 @@ static void *autoservice_run(void *ign)
 
 		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 @@ static void *autoservice_run(void *ign)
 		}
 	}
 
-	if (callid) {
-		ast_callid_threadassoc_remove();
-		callid = ast_callid_unref(callid);
-	}
-
 	asthread = AST_PTHREADT_NULL;
 
 	return NULL;