diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index cd7cb3f477..0292847f0b 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3350,6 +3350,8 @@
         <item quantity="one">Sign out of %1$d session</item>
         <item quantity="other">Sign out of %1$d sessions</item>
     </plurals>
+    <string name="device_manager_other_sessions_show_ip_address">Show IP address</string>
+    <string name="device_manager_other_sessions_hide_ip_address">Hide IP address</string>
     <string name="device_manager_session_overview_signout">Sign out of this session</string>
     <string name="device_manager_session_details_title">Session details</string>
     <string name="device_manager_session_details_description">Application, device, and activity information.</string>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
index 21cbb86e94..6f002359c8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
@@ -29,4 +29,5 @@ sealed class DevicesAction : VectorViewModelAction {
     object VerifyCurrentSession : DevicesAction()
     data class MarkAsManuallyVerified(val cryptoDeviceInfo: CryptoDeviceInfo) : DevicesAction()
     object MultiSignoutOtherSessions : DevicesAction()
+    object ToggleIpAddressVisibility : DevicesAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
index c714645b9a..3cacf82f14 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
@@ -116,9 +116,15 @@ class DevicesViewModel @AssistedInject constructor(
             is DevicesAction.VerifyCurrentSession -> handleVerifyCurrentSessionAction()
             is DevicesAction.MarkAsManuallyVerified -> handleMarkAsManuallyVerifiedAction()
             DevicesAction.MultiSignoutOtherSessions -> handleMultiSignoutOtherSessions()
+            DevicesAction.ToggleIpAddressVisibility -> handleToggleIpAddressVisibility()
         }
     }
 
+    private fun handleToggleIpAddressVisibility() = withState { state ->
+        val isShowingIpAddress = state.isShowingIpAddress
+        setState { copy(isShowingIpAddress = !isShowingIpAddress) }
+    }
+
     private fun handleVerifyCurrentSessionAction() {
         viewModelScope.launch {
             val currentSessionCanBeVerified = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
index e8bed35e24..e0531c34dc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
@@ -27,4 +27,5 @@ data class DevicesViewState(
         val unverifiedSessionsCount: Int = 0,
         val inactiveSessionsCount: Int = 0,
         val isLoading: Boolean = false,
+        val isShowingIpAddress: Boolean = false,
 ) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 3a3c3463fb..c9957efc58 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -146,11 +146,19 @@ class VectorSettingsDevicesFragment :
                     confirmMultiSignoutOtherSessions()
                     true
                 }
+                R.id.otherSessionsHeaderToggleIpAddress -> {
+                    handleToggleIpAddressVisibility()
+                    true
+                }
                 else -> false
             }
         }
     }
 
+    private fun handleToggleIpAddressVisibility() {
+        viewModel.handle(DevicesAction.ToggleIpAddressVisibility)
+    }
+
     private fun confirmMultiSignoutOtherSessions() {
         activity?.let {
             buildConfirmSignoutDialogUseCase.execute(it, this::multiSignoutOtherSessions)
@@ -240,7 +248,7 @@ class VectorSettingsDevicesFragment :
 
             renderSecurityRecommendations(state.inactiveSessionsCount, state.unverifiedSessionsCount, isCurrentSessionVerified)
             renderCurrentDevice(currentDeviceInfo)
-            renderOtherSessionsView(otherDevices)
+            renderOtherSessionsView(otherDevices, state.isShowingIpAddress)
         } else {
             hideSecurityRecommendations()
             hideCurrentSessionView()
@@ -297,7 +305,7 @@ class VectorSettingsDevicesFragment :
         hideInactiveSessionsRecommendation()
     }
 
-    private fun renderOtherSessionsView(otherDevices: List<DeviceFullInfo>?) {
+    private fun renderOtherSessionsView(otherDevices: List<DeviceFullInfo>?, isShowingIpAddress: Boolean) {
         if (otherDevices.isNullOrEmpty()) {
             hideOtherSessionsView()
         } else {
@@ -313,7 +321,12 @@ class VectorSettingsDevicesFragment :
                     totalNumberOfDevices = otherDevices.size,
                     showViewAll = otherDevices.size > NUMBER_OF_OTHER_DEVICES_TO_RENDER
             )
-        }
+            views.deviceListHeaderOtherSessions.menu.findItem(R.id.otherSessionsHeaderToggleIpAddress).title = if (isShowingIpAddress) {
+                stringProvider.getString(R.string.device_manager_other_sessions_hide_ip_address)
+            } else {
+                stringProvider.getString(R.string.device_manager_other_sessions_show_ip_address)
+            }
+         }
     }
 
     private fun hideOtherSessionsView() {
diff --git a/vector/src/main/res/menu/menu_other_sessions_header.xml b/vector/src/main/res/menu/menu_other_sessions_header.xml
index 00778ed36e..d1386ba461 100644
--- a/vector/src/main/res/menu/menu_other_sessions_header.xml
+++ b/vector/src/main/res/menu/menu_other_sessions_header.xml
@@ -4,6 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AlwaysShowAction">
 
+    <item
+        android:id="@+id/otherSessionsHeaderToggleIpAddress"
+        android:title="@string/device_manager_other_sessions_show_ip_address"
+        app:showAsAction="withText|never" />
+
     <item
         android:id="@+id/otherSessionsHeaderMultiSignout"
         android:title="@plurals/device_manager_other_sessions_multi_signout_all"