diff --git a/src/c3nav/editor/wrappers.py b/src/c3nav/editor/wrappers.py
index 0047756d..b0f32fd8 100644
--- a/src/c3nav/editor/wrappers.py
+++ b/src/c3nav/editor/wrappers.py
@@ -280,7 +280,7 @@ class BaseQueryWrapper(BaseWrapper):
         return iter((self._wrap_instance(instance) for instance in self.get_queryset()))
 
     def iterator(self):
-        return iter(self)
+        return iter((self._wrap_instance(instance) for instance in self.get_queryset().iterator()))
 
     def __len__(self):
         return len(self.get_queryset())