diff --git a/src/main/java/com/bitmovin/api/BitmovinApi.java b/src/main/java/com/bitmovin/api/BitmovinApi.java
index 73f01c3..203caf0 100644
--- a/src/main/java/com/bitmovin/api/BitmovinApi.java
+++ b/src/main/java/com/bitmovin/api/BitmovinApi.java
@@ -148,7 +148,8 @@ public BitmovinApi(String apiKey, String apiUrl, String tenantID, boolean useHtt
 
         this.tenantID = tenantID;
         this.apiKey = apiKey;
-        this.apiUrl = apiUrl == null ? ApiUrls.API_ENDPOINT_WITH_PROTOCOL + "/v1/" : String.format("%s://%s/", useHttps ? "https" : "http", apiUrl);
+        this.apiUrl = apiUrl == null ? ApiUrls.API_ENDPOINT_WITH_PROTOCOL + "/v1/" : String.format("%s://%s", useHttps ? "https" : "http", apiUrl);
+        ApiUrls.API_ENDPOINT_WITH_PROTOCOL = this.apiUrl;
 
         this.setDefaultHeaders();
         this.initContainers();
diff --git a/src/main/java/com/bitmovin/api/constants/ApiUrls.java b/src/main/java/com/bitmovin/api/constants/ApiUrls.java
index dd2094f..3ff9499 100644
--- a/src/main/java/com/bitmovin/api/constants/ApiUrls.java
+++ b/src/main/java/com/bitmovin/api/constants/ApiUrls.java
@@ -7,8 +7,8 @@
  */
 public class ApiUrls
 {
-    public static final String API_ENDPOINT = "api.bitmovin.com/v1";
-    public static final String API_ENDPOINT_WITH_PROTOCOL = "https://" + API_ENDPOINT;
+    public static String API_ENDPOINT = "api.bitmovin.com/v1";
+    public static String API_ENDPOINT_WITH_PROTOCOL = "https://" + API_ENDPOINT;
 
     public static final String analyticsQuery = "analytics/queries";
     public static final String analyticsLicenses = "analytics/licenses";