diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java
index b6c1c9556e3ce372f3df1551fff825a8df5fe91b..3eae410f994335d44c7c4589489c938462fee82e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java
@@ -16,12 +16,10 @@ public class ProviderApiManagerFactory {
     }
 
     public IProviderApiManager getProviderApiManager(Provider provider) throws IllegalArgumentException {
-        switch (provider.getApiVersion()) {
-            case 5:
-                return new ProviderApiManagerV5(resources, callback);
-            default:
-                OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(resources);
-                return new ProviderApiManagerV3(resources, clientGenerator, callback);
+        if (provider.getApiVersion() >= 5) {
+            return new ProviderApiManagerV5(resources, callback);
         }
+        OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(resources);
+        return new ProviderApiManagerV3(resources, clientGenerator, callback);
     }
 }