diff --git a/src/Services/ImportExportSystem/EntityImporter.php b/src/Services/ImportExportSystem/EntityImporter.php
index 3513be5f..11915cfb 100644
--- a/src/Services/ImportExportSystem/EntityImporter.php
+++ b/src/Services/ImportExportSystem/EntityImporter.php
@@ -157,7 +157,10 @@ class EntityImporter
                 }
             }
 
-            $last_element = $entity;
+            $last_element = end($entities);
+            if ($last_element === false) {
+                $last_element = null;
+            }
         }
 
         //Only return objects once