diff --git a/src/box/request.m b/src/box/request.m
index cc5c912e62393df3d7292e8f8c656f84c4258dd2..fbf7a0f482f7c7591c77280e310b6c22c3215c06 100644
--- a/src/box/request.m
+++ b/src/box/request.m
@@ -88,6 +88,7 @@ execute_replace(struct request *request, struct txn *txn)
 	/* Try to find tuple by primary key */
 	Index *pk = space_index(sp, 0);
 
+	/* Check to see if the tuple has a sufficient number of fields. */
 	if (unlikely(txn->new_tuple->field_count < sp->max_fieldno)) {
 		tnt_raise(IllegalParams, :"tuple must have all indexed fields");
 	}
diff --git a/src/box/space.m b/src/box/space.m
index 5a08e1b2e9dd0865504896bd644f8ced17ad5f55..c26ddecc0632dd5ecbd830945021ea27897102b4 100644
--- a/src/box/space.m
+++ b/src/box/space.m
@@ -141,10 +141,6 @@ space_validate(struct space *sp, struct tuple *old_tuple,
 		return;
 	}
 
-	/* Check to see if the tuple has a sufficient number of fields. */
-	if (new_tuple->field_count < sp->max_fieldno)
-		tnt_raise(IllegalParams, :"tuple must have all indexed fields");
-
 	if (sp->arity > 0 && sp->arity != new_tuple->field_count)
 		tnt_raise(IllegalParams, :"tuple field count must match space cardinality");