diff --git a/backend/src/main/java/com/vaessl/app/connection/ConnectionService.java b/backend/src/main/java/com/vaessl/app/connection/ConnectionService.java
index 518e0f9..93e341a 100644
--- a/backend/src/main/java/com/vaessl/app/connection/ConnectionService.java
+++ b/backend/src/main/java/com/vaessl/app/connection/ConnectionService.java
@@ -1,9 +1,9 @@
 package com.vaessl.app.connection;
 
 import java.time.Instant;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
@@ -18,8 +18,11 @@ public class ConnectionService {
     private final ConnectionRepository cRepository;
 
     public ConnectionService(List<ConnectionProvider> providers, ConnectionRepository cRepository) {
-        this.providerRegistry = providers.stream()
-                .collect(Collectors.toMap(ConnectionProvider::getServiceType, p -> p));
+        Map<ServiceType, ConnectionProvider> registry = new EnumMap<>(ServiceType.class);
+        for (ConnectionProvider provider : providers) {
+            registry.put(provider.getServiceType(), provider);
+        }
+        this.providerRegistry = registry;
         this.cRepository = cRepository;
     }
 
diff --git a/backend/src/main/java/com/vaessl/app/search/SearchService.java b/backend/src/main/java/com/vaessl/app/search/SearchService.java
index a5314c7..4717205 100644
--- a/backend/src/main/java/com/vaessl/app/search/SearchService.java
+++ b/backend/src/main/java/com/vaessl/app/search/SearchService.java
@@ -1,8 +1,8 @@
 package com.vaessl.app.search;
 
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -16,8 +16,12 @@ public class SearchService {
     private final Map<ServiceType, SearchProvider> providerRegistry;
 
     public SearchService(List<SearchProvider> providers) {
-        this.providerRegistry = Map.copyOf(providers.stream()
-                .collect(Collectors.toMap(SearchProvider::getServiceType, p -> p)));
+        Map<ServiceType, SearchProvider> registry = new EnumMap<>(ServiceType.class);
+        for (SearchProvider provider : providers) {
+            registry.put(provider.getServiceType(), provider);
+        }
+        this.providerRegistry = registry;
+
     }
 
     /**