diff --git a/src/c3nav/control/models.py b/src/c3nav/control/models.py
index 55b9d88f..156de764 100644
--- a/src/c3nav/control/models.py
+++ b/src/c3nav/control/models.py
@@ -19,7 +19,7 @@ class UserPermissions(models.Model):
 
     review_changesets = models.BooleanField(default=False, verbose_name=_('can review changesets'))
     direct_edit = models.BooleanField(default=False, verbose_name=_('can activate direct editing'))
-    max_changeset_changes = models.PositiveSmallIntegerField(default=10, verbose_name=_('max changes per changeset'))
+    max_changeset_changes = models.PositiveSmallIntegerField(default=20, verbose_name=_('max changes per changeset'))
     editor_access = models.BooleanField(default=False, verbose_name=_('can always access editor'))
     sources_access = models.BooleanField(default=False, verbose_name=_('can access sources in editor'))
     base_mapdata_access = models.BooleanField(default=False, verbose_name=_('can always access base map data'))
diff --git a/src/c3nav/editor/changes.py b/src/c3nav/editor/changes.py
index bebf449b..039de636 100644
--- a/src/c3nav/editor/changes.py
+++ b/src/c3nav/editor/changes.py
@@ -672,6 +672,7 @@ class ChangedObjectCollection(BaseSchema):
                             objects=[last_operation, new_operation],
                         )
                     elif (isinstance(last_operation, CreateMultipleObjectsOperation) and
+                            len(last_operation.objects) < 25 and
                             last_operation.objects[-1].obj.model == new_operation.obj.model):
                         last_operation.objects.append(new_operation)
                     else:
diff --git a/src/c3nav/editor/views/edit.py b/src/c3nav/editor/views/edit.py
index dbbb4396..c00df3f4 100644
--- a/src/c3nav/editor/views/edit.py
+++ b/src/c3nav/editor/views/edit.py
@@ -128,7 +128,7 @@ def space_detail(request, level, pk):
 
 
 def get_changeset_exceeded(request):
-    return request.user_permissions.max_changeset_changes <= len(request.changeset.changes)
+    return request.user_permissions.max_changeset_changes <= len(request.changeset.as_operations)
 
 
 @etag(editor_etag_func)