diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index 7f9f9836d..ecb0bbbf4 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -168,6 +168,7 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
         }
     }
     val pushNotification = MutableLiveData<Boolean>()
+    val pushNotificationsAvailable = MutableLiveData<Boolean>()
 
     val transportListener = object : SettingListenerStub() {
         override fun onListValueChanged(position: Int) {
@@ -286,6 +287,7 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
         domain.value = proxyConfig.identityAddress.domain
         disable.value = !proxyConfig.registerEnabled()
         pushNotification.value = proxyConfig.isPushNotificationAllowed
+        pushNotificationsAvailable.value = core.isPushNotificationAvailable
         proxy.value = proxyConfig.serverAddr
         outboundProxy.value = proxyConfig.serverAddr == proxyConfig.route
         stunServer.value = proxyConfig.natPolicy?.stunServer
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
index 24f8c191d..0cd45cce3 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
@@ -43,6 +43,7 @@ class NetworkSettingsViewModel : GenericSettingsViewModel() {
         }
     }
     val pushNotifications = MutableLiveData<Boolean>()
+    val pushNotificationsAvailable = MutableLiveData<Boolean>()
 
     val randomPortsListener = object : SettingListenerStub() {
         override fun onBoolValueChanged(newValue: Boolean) {
@@ -65,6 +66,7 @@ class NetworkSettingsViewModel : GenericSettingsViewModel() {
         wifiOnly.value = core.wifiOnlyEnabled()
         allowIpv6.value = core.ipv6Enabled()
         pushNotifications.value = core.isPushNotificationEnabled
+        pushNotificationsAvailable.value = core.isPushNotificationAvailable
         randomPorts.value = getSipPort() == -1
         sipPort.value = getSipPort()
     }
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 74d5bca61..54fde5afd 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -37,7 +37,7 @@ class CorePreferences constructor(private val context: Context) {
     /* App settings */
 
     var debugLogs: Boolean
-        get() = config.getBool("app", "debug", true)
+        get() = config.getBool("app", "debug", BuildConfig.DEBUG)
         set(value) {
             config.setBool("app", "debug", value)
         }
diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
index ef992f3be..43063f2eb 100644
--- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt
+++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
@@ -22,7 +22,6 @@ package org.linphone.utils
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
-import org.linphone.core.tools.Log
 
 class TimestampUtils {
     companion object {
@@ -80,7 +79,7 @@ class TimestampUtils {
             if (isSameYear(timestamp, timestampInSecs)) {
                 // Remove the year part of the format
                 dateFormat.applyPattern(
-                    dateFormat.toPattern().replace("/?y+/?|\\s?y+\\s?".toRegex(),"")
+                    dateFormat.toPattern().replace("/?y+/?|\\s?y+\\s?".toRegex(), "")
                 )
             }
 
diff --git a/app/src/main/res/layout/settings_account_fragment.xml b/app/src/main/res/layout/settings_account_fragment.xml
index 92dc43441..a16842dc1 100644
--- a/app/src/main/res/layout/settings_account_fragment.xml
+++ b/app/src/main/res/layout/settings_account_fragment.xml
@@ -156,7 +156,8 @@
                     linphone:title="@{@string/account_settings_push_notification_title}"
                     linphone:subtitle="@{@string/account_settings_push_notification_summary}"
                     linphone:listener="@{viewModel.pushNotificationListener}"
-                    linphone:checked="@={viewModel.pushNotification}"/>
+                    linphone:checked="@={viewModel.pushNotification}"
+                    android:visibility="@{viewModel.pushNotificationsAvailable ? View.VISIBLE : View.GONE}"/>
 
                 <include
                     layout="@layout/settings_widget_list"
diff --git a/app/src/main/res/layout/settings_network_fragment.xml b/app/src/main/res/layout/settings_network_fragment.xml
index 4444bc16d..db2f84f1f 100644
--- a/app/src/main/res/layout/settings_network_fragment.xml
+++ b/app/src/main/res/layout/settings_network_fragment.xml
@@ -84,7 +84,8 @@
                     linphone:title="@{@string/network_settings_push_notifications_title}"
                     linphone:subtitle="@{@string/advanced_settings_push_notifications_summary}"
                     linphone:listener="@{viewModel.pushNotificationsListener}"
-                    linphone:checked="@={viewModel.pushNotifications}"/>
+                    linphone:checked="@={viewModel.pushNotifications}"
+                    linphone:enabled="@{viewModel.pushNotificationsAvailable}"/>
 
                 <include
                     layout="@layout/settings_widget_switch"