diff --git a/vector/build.gradle b/vector/build.gradle
index c0f4ce1fbe..2b12ce188c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 2
-ext.versionPatch = 0
+ext.versionPatch = 1
 
 ext.scVersion = 40
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNewEndpoint.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNewEndpoint.kt
index cb09046628..76e1b7c662 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNewEndpoint.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNewEndpoint.kt
@@ -35,12 +35,22 @@ class TestNewEndpoint @Inject constructor(private val context: AppCompatActivity
 
         val endpoint = UPHelper.getUpEndpoint(context)
 
-        if (!endpoint.isNullOrEmpty()) {
-            status = TestStatus.SUCCESS
-            description = stringProvider.getString(R.string.settings_troubleshoot_test_endpoint_success, endpoint)
+        if (UPHelper.isEmbeddedDistributor(context)) {
+            if (!endpoint.isNullOrEmpty()) {
+                status = TestStatus.SUCCESS
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_success, endpoint)
+            } else {
+                status = TestStatus.FAILED
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed)
+            }
         } else {
-            status = TestStatus.FAILED
-            description = stringProvider.getString(R.string.settings_troubleshoot_test_endpoint_failed)
+            if (!endpoint.isNullOrEmpty()) {
+                status = TestStatus.SUCCESS
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_endpoint_success, endpoint)
+            } else {
+                status = TestStatus.FAILED
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_endpoint_failed)
+            }
         }
     }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 7d873f3e3a..60b6ce51b9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1132,7 +1132,7 @@
     <string name="settings_troubleshoot_test_play_services_quickfix">Fix Play Services</string>
 
     <!-- Unifiedpush Endpoint -->
-    <string name="settings_troubleshoot_test_endpoint_title">Endpoint</string>
+    <string name="settings_troubleshoot_test_endpoint_title">Endpoint/FCM</string>
     <string name="settings_troubleshoot_test_endpoint_success">Endpoint successfully retrieved:\n%1$s</string>
     <string name="settings_troubleshoot_test_endpoint_failed">Failed to retrieved Endpoint.</string>