diff --git a/core/src/main/java/com/inensus/core/sharedpreferences/SharedPreferenceWrapper.kt b/core/src/main/java/com/inensus/core/sharedpreferences/SharedPreferenceWrapper.kt
index b998c22..c8c20f9 100644
--- a/core/src/main/java/com/inensus/core/sharedpreferences/SharedPreferenceWrapper.kt
+++ b/core/src/main/java/com/inensus/core/sharedpreferences/SharedPreferenceWrapper.kt
@@ -17,7 +17,8 @@ class SharedPreferenceWrapper(
     var baseUrl: String?
         get() = preferences.getString(KEY_BASE_URL, DEFAULT_BASE_URL)
         set(url) {
-            preferences.edit().putString(KEY_BASE_URL, url + BASE_URL_SUFFIX).apply()
+            val cleanUrl = url?.trimEnd('/') ?: ""
+            preferences.edit().putString(KEY_BASE_URL, "$cleanUrl$BASE_URL_SUFFIX").apply()
         }
 
     var deviceId: String