diff --git a/model/src/main/java/org/gorpipe/gor/driver/providers/stream/sources/mdr/MdrServer.java b/model/src/main/java/org/gorpipe/gor/driver/providers/stream/sources/mdr/MdrServer.java
index 31f45bef..39463c68 100644
--- a/model/src/main/java/org/gorpipe/gor/driver/providers/stream/sources/mdr/MdrServer.java
+++ b/model/src/main/java/org/gorpipe/gor/driver/providers/stream/sources/mdr/MdrServer.java
@@ -39,7 +39,7 @@ public class MdrServer {
 
     /* Lazy load the mdr servers */
     private static HashMap<String, MdrServer> getMdrServers() {
-        if (mdrServers != null) {
+        if (mdrServers == null) {
             loadMdrServers(defaultConfig);
         }
         return mdrServers;
diff --git a/model/src/test/java/org/gorpipe/gor/driver/providers/mdr/UTestMDR.java b/model/src/test/java/org/gorpipe/gor/driver/providers/mdr/UTestMDR.java
index 0b821212..18f8c6ae 100644
--- a/model/src/test/java/org/gorpipe/gor/driver/providers/mdr/UTestMDR.java
+++ b/model/src/test/java/org/gorpipe/gor/driver/providers/mdr/UTestMDR.java
@@ -63,7 +63,6 @@ public static void setupClass() throws IOException {
                 dev\t%s\t%s\t%s\t%s
                 """.formatted(config.mdrServer(), config.keycloakAuthServer(), config.keycloakClientId(), secret));
         System.setProperty("gor.mdr.credentials", credFile.toString());
-        MdrServer.loadMdrServers(config);
     }
 
     @Test