diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts
index 406d6a2ff4..e6a605f5e4 100644
--- a/features/preferences/impl/build.gradle.kts
+++ b/features/preferences/impl/build.gradle.kts
@@ -82,6 +82,7 @@ dependencies {
     testImplementation(projects.libraries.indicator.impl)
     testImplementation(projects.features.logout.impl)
     testImplementation(projects.services.analytics.test)
+    testImplementation(projects.services.toolbox.test)
     testImplementation(projects.features.analytics.impl)
     testImplementation(projects.tests.testutils)
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
index 7eff670951..8fa62df910 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
@@ -33,11 +33,17 @@ class DefaultVersionFormatter @Inject constructor(
     private val buildMeta: BuildMeta,
 ) : VersionFormatter {
     override fun get(): String {
-        return stringProvider.getString(
+        val base = stringProvider.getString(
             CommonStrings.settings_version_number,
             buildMeta.versionName,
             buildMeta.versionCode.toString()
         )
+        return if (buildMeta.gitBranchName == "main") {
+            base
+        } else {
+            // In case of a build not from main, we display the branch name and the revision
+            "$base\n${buildMeta.gitBranchName}\n${buildMeta.gitRevision}"
+        }
     }
 }
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt
new file mode 100644
index 0000000000..5d35a105b7
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.preferences.impl.root
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class VersionFormatterTest {
+    @Test
+    fun `version formatter should return simplified version for other branch`() = runTest {
+        val sut = DefaultVersionFormatter(
+            stringProvider = FakeStringProvider(defaultResult = VERSION),
+            buildMeta = aBuildMeta(gitBranchName = "main")
+        )
+        assertThat(sut.get()).isEqualTo(VERSION)
+    }
+
+    @Test
+    fun `version formatter should return simplified version for main branch`() = runTest {
+        val sut = DefaultVersionFormatter(
+            stringProvider = FakeStringProvider(defaultResult = VERSION),
+            buildMeta = aBuildMeta(
+                gitBranchName = "branch",
+                gitRevision = "1234567890",
+            )
+        )
+        assertThat(sut.get()).isEqualTo("$VERSION\nbranch\n1234567890")
+    }
+
+    companion object {
+        const val VERSION = "version"
+    }
+}