diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 55cde7a44..97e6039bf 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -945,7 +945,7 @@ public class NotificationService {
             return false;
         }
 
-        long throttlingPeriod = mXmppConnectionService.getLongPreference("notification_throttling_period", 0);
+        long throttlingPeriod = mXmppConnectionService.getLongPreference("notification_throttling_period", R.integer.default_notification_throttling_period);
 
         if (throttlingPeriod <= 0) {
             return false;
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 8c7c6ec88..52f74aaf2 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -16,6 +16,7 @@
     <string name="notification_ringtone">content://settings/system/notification_sound</string>
     <string name="incoming_call_ringtone">content://settings/system/ringtone</string>
     <integer name="grace_period">144</integer>
+    <integer name="default_notification_throttling_period">0</integer>
     <integer name="auto_accept_filesize">524288</integer>
     <string name="picture_compression">auto</string>
     <bool name="use_green_background">true</bool>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 8cad42374..8570cd1d7 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -80,7 +80,7 @@
             android:summary="@string/pref_notification_grace_period_summary"
             android:title="@string/pref_notification_grace_period" />
         <ListPreference
-            android:defaultValue="0"
+            android:defaultValue="@integer/default_notification_throttling_period"
             android:entries="@array/notification_throttling_periods"
             android:entryValues="@array/notification_throttling_periods_values"
             android:key="notification_throttling_period"