diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
index abd823fa99..87ad637ca5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
@@ -23,7 +23,8 @@ import org.matrix.android.sdk.api.federation.FederationVersion
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
 data class HomeServerSettingsViewState(
-        val baseUrl: String = "",
+        val homeserverUrl: String = "",
+        val homeserverClientServerApiUrl: String = "",
         val homeServerCapabilities: HomeServerCapabilities = HomeServerCapabilities(),
         val federationVersion: Async<FederationVersion> = Uninitialized
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
index 3217756a82..f13240a74e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
@@ -29,13 +29,15 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.discovery.settingsCenteredImageItem
 import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.federation.FederationVersion
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import javax.inject.Inject
 
 class HomeserverSettingsController @Inject constructor(
         private val stringProvider: StringProvider,
-        private val errorFormatter: ErrorFormatter
+        private val errorFormatter: ErrorFormatter,
+        private val vectorPreferences: VectorPreferences
 ) : TypedEpoxyController<HomeServerSettingsViewState>() {
 
     var callback: Callback? = null
@@ -78,7 +80,17 @@ class HomeserverSettingsController @Inject constructor(
         }
         settingsInfoItem {
             id("urlValue")
-            helperText(state.baseUrl)
+            helperText(state.homeserverUrl)
+        }
+        if (vectorPreferences.developerMode()) {
+            settingsSectionTitleItem {
+                id("urlApiTitle")
+                titleResId(R.string.hs_client_url)
+            }
+            settingsInfoItem {
+                id("urlApiValue")
+                helperText(state.homeserverClientServerApiUrl)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
index 17f03a3456..623ac37aa4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
@@ -53,7 +53,8 @@ class HomeserverSettingsViewModel @AssistedInject constructor(
     init {
         setState {
             copy(
-                    baseUrl = session.sessionParams.homeServerUrl,
+                    homeserverUrl = session.sessionParams.homeServerUrl,
+                    homeserverClientServerApiUrl = session.sessionParams.homeServerUrlBase,
                     homeServerCapabilities = session.getHomeServerCapabilities()
             )
         }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 6908fe5d79..88d79450dc 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -538,6 +538,7 @@
     <string name="login">Log in</string>
     <string name="logout">Sign out</string>
     <string name="hs_url">Homeserver URL</string>
+    <string name="hs_client_url">Homeserver API URL</string>
     <string name="identity_url">Identity Server URL</string>
     <string name="search">Search</string>