diff --git a/coreapi/misc.c b/coreapi/misc.c
index 3586cd6c7..fcfaeabea 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -1714,10 +1714,10 @@ bool_t check_ice_reinvite_needs_defered_response(LinphoneCall *call){
 		
 		if (ice_check_list_state(cl) != ICL_Running) continue;
 
-		for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES; j++) {
+		for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES; j++) {
 			const SalIceRemoteCandidate *remote_candidate = &stream->ice_remote_candidates[j];
 			if (remote_candidate->addr[0] != '\0') return TRUE;
-
+			else break;
 		}
 	}
 	return FALSE;