diff --git a/main/pbx.c b/main/pbx.c
index b62314aded..1e0401373d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3774,6 +3774,8 @@ static int handle_statechange(void *datap)
 {
 	struct ast_hint *hint;
 	struct statechange *sc = datap;
+
+	ast_rdlock_contexts();
 	AST_RWLIST_RDLOCK(&hints);
 
 	AST_RWLIST_TRAVERSE(&hints, hint, list) {
@@ -3812,6 +3814,7 @@ static int handle_statechange(void *datap)
 		hint->laststate = state;	/* record we saw the change */
 	}
 	AST_RWLIST_UNLOCK(&hints);
+	ast_unlock_contexts();
 	ast_free(sc);
 	return 0;
 }