diff --git a/Classes/Controller/ContactController.php b/Classes/Controller/ContactController.php
index d6f9825..36f53d2 100644
--- a/Classes/Controller/ContactController.php
+++ b/Classes/Controller/ContactController.php
@@ -72,18 +72,13 @@ public function listAction()
 			if (!empty($selectedContactsStr))
 			{
 				$contacts = explode(",", $selectedContactsStr);
+				$contactObjects = $this->contactRepository->findMultipleByUid($contacts);
 			}
-			$contactObjects = $this->contactRepository->findMultipleByUid($contacts);
-
-			$contactByUid = [];
-
-			foreach ($contactObjects as $contact)
+			else
 			{
-				$contactByUid[$contact->getLocalizedUid()] = $contact;
+				$contactObjects = $this->contactRepository->findAll();
 			}
 
-			$contactObjects = array_replace(array_flip($contacts), $contactByUid);
-
 			$this->view->assign('contacts', $contactObjects);
 		}
 	}