diff --git a/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php b/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php
index b7608dd7d5..810abdbb9d 100644
--- a/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php
+++ b/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php
@@ -125,9 +125,8 @@ public function buildIterator()
 
         $collection = new ArrayCollection();
         $i = 0;
-        foreach ($iterableResult as $row) {
+        foreach ($iterableResult as $submission) {
             /* @var FormSubmission $submission */
-            $submission = $row[0];
 
             // Write row data
             $data = [
diff --git a/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php b/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php
index 8f8dc9ae2e..676a9a9479 100644
--- a/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php
+++ b/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php
@@ -56,9 +56,9 @@ protected function getMockedEntityManager(): \Doctrine\ORM\EntityManager
         ]));
 
         $submissions = [
-            [$sub],
-            [new FormSubmission()],
-            [new FormSubmission()],
+            $sub,
+            new FormSubmission(),
+            new FormSubmission(),
         ];
         $query = $this->getMockBuilder('Doctrine\ORM\AbstractQuery')
             ->disableOriginalConstructor()