diff --git a/openbsc/src/handover_decision.c b/openbsc/src/handover_decision.c
index c0ec0a9..3605a8e 100644
--- a/openbsc/src/handover_decision.c
+++ b/openbsc/src/handover_decision.c
@@ -71,6 +71,9 @@
 	/* FIXME: implement actual averaging over multiple measurement
 	 * reports */
 
+	if (mr->num_cell > 6)
+		return 0;
+
 	/* find the best cell in this report that is at least RXLEV_HYST
 	 * better than the current serving cell */
 	for (i = 0; i < mr->num_cell; i++) {