diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
index 64915d31..b45f070c 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
@@ -44,9 +44,10 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
         context.define(currentSubject, assumedRoles);
 
         validate("caption, emailAddress").atMaxOne(caption, emailAddress);
-        final var entities = caption != null
-             ? contactRepo.findContactByOptionalCaptionLike(caption)
-             : contactRepo.findContactByEmailAddress(emailAddress);
+        final var entities = emailAddress != null
+             ? contactRepo.findContactByEmailAddress(emailAddress)
+             : contactRepo.findContactByOptionalCaptionLike(caption);
+
 
         final var resources = mapper.mapList(entities, HsOfficeContactResource.class);
         return ResponseEntity.ok(resources);