diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InfoController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InfoController.java
index 9251697a..b00c0a91 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InfoController.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InfoController.java
@@ -84,8 +84,8 @@ public class InfoController {
                 .getOrThrow()
                 .stream()
                 .filter(inst -> BooleanUtils.isTrue(inst.active) &&
-                        (inst.urlSuffix == null ||
-                                urlSuffix.equals(inst.urlSuffix)))
+                        inst.urlSuffix != null &&
+                        urlSuffix.equals(inst.urlSuffix))
                 .map(inst -> new EntityName(inst.getEntityKey(), inst.name))
                 .collect(Collectors.toList());
     }