diff --git a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongList.java b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongList.java
index 050078d7a2a10..7a533548cdb56 100644
--- a/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongList.java
+++ b/community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveLongList.java
@@ -28,7 +28,7 @@ public class PrimitiveLongList implements PrimitiveLongCollection
 {
     private static final int DEFAULT_SIZE = 8;
 
-    private long[] elements = PrimitiveLongCollections.EMPTY_LONG_ARRAY;
+    private long[] elements;
     private int size;
 
     PrimitiveLongList()
@@ -111,20 +111,14 @@ private void ensureCapacity()
         elements = Arrays.copyOf( elements, newCapacity );
     }
 
-    private class PrimitiveLongListIterator implements PrimitiveLongIterator
+    private class PrimitiveLongListIterator extends PrimitiveLongCollections.PrimitiveLongBaseIterator
     {
         int cursor;
 
         @Override
-        public boolean hasNext()
+        protected boolean fetchNext()
         {
-            return cursor < size;
-        }
-
-        @Override
-        public long next()
-        {
-            return elements[cursor++];
+            return cursor < size && next( elements[cursor++] );
         }
     }
 }