diff --git a/main/manager.c b/main/manager.c
index 4b0f87e458..5a852bfbec 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1149,7 +1149,7 @@ static int action_waitevent(struct mansession *s, struct message *m)
 		ast_mutex_unlock(&s->__lock);
 		if (needexit)
 			break;
-		if (!s->inuse && s->fd > 0) {	/* AMI session */
+		if (s->managerid == 0) {	/* AMI session */
 			if (ast_wait_for_input(s->fd, 1000))
 				break;
 		} else {	/* HTTP session */