diff --git a/src/composite.c b/src/composite.c
index 04836fb36d1..9ff5f855bed 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -509,7 +509,7 @@ update_compositions (from, to, check_mask)
 	  run_composition_function (start, end, prop);
 	  from = end;
 	}
-      else if (from < to
+      else if (from < ZV
 	       && find_composition (from, -1, &start, &from, &prop, Qnil))
 	run_composition_function (start, from, prop);
     }