diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 1dcac5624..fa5f89e72 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1111,7 +1111,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public long getNotificationThrottlingPeriod() {
-        return this.getLongAttribute(ATTRIBUTE_NOTIFICATIONS_THROTTLING_PERIOD, -1);
+        return this.getLongAttribute(ATTRIBUTE_NOTIFICATIONS_THROTTLING_PERIOD, -2);
     }
 
     public boolean alwaysNotify() {
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 9df0c09ad..a30ffa78e 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -969,6 +969,10 @@ public class NotificationService {
 
         long throttlingPeriod = c.getNotificationThrottlingPeriod();
 
+        if (throttlingPeriod < -1) {
+            throttlingPeriod = mXmppConnectionService.getLongPreference("notification_throttling_period", R.integer.default_notification_throttling_period);
+        }
+
         if (throttlingPeriod <= 0) {
             return false;
         }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index dc97956b6..d426ddecc 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2517,7 +2517,8 @@ public class ConversationFragment extends XmppFragment
     protected void throttleNoisyNoftificationsDialog(final Conversation conversation) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle(R.string.pref_noisy_notifications_throttling);
-        final int[] durations = activity.getResources().getIntArray(R.array.notification_throttling_periods_values);
+        final int[] durations = activity.getResources().getIntArray(R.array.notification_throttling_periods_values_per_conversation);
+
         final CharSequence[] labels = new CharSequence[durations.length];
         int checkedIndex = -1;
         long period = conversation.getNotificationThrottlingPeriod();
@@ -2528,6 +2529,8 @@ public class ConversationFragment extends XmppFragment
 
             if (durations[i] == -1) {
                 labels[i] = activity.getString(R.string.never);
+            } else if (durations[i] == -2) {
+                labels[i] = activity.getString(R.string.inherit);
             } else {
                 labels[i] = TimeFrameUtils.resolve(activity, durations[i]);
             }
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index b09030556..3ddf86d9c 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -26,7 +26,22 @@
 		<item>-1</item>
 	</integer-array>
 
-	<integer-array name="notification_throttling_periods_values">
+	<string-array name="notification_throttling_periods_values">
+		<item>-1</item>
+		<item>5000</item>
+		<item>15000</item>
+		<item>30000</item>
+		<item>60000</item>
+		<item>120000</item>
+		<item>180000</item>
+		<item>300000</item>
+		<item>600000</item>
+		<item>900000</item>
+		<item>1800000</item>
+	</string-array>
+
+	<integer-array name="notification_throttling_periods_values_per_conversation">
+		<item>-2</item>
 		<item>-1</item>
 		<item>5000</item>
 		<item>15000</item>
@@ -40,6 +55,20 @@
 		<item>1800000</item>
 	</integer-array>
 
+	<string-array name="notification_throttling_periods">
+		<item>@string/never</item>
+		<item>5 sec</item>
+		<item>15 sec</item>
+		<item>30 sec</item>
+		<item>1 min</item>
+		<item>2 min</item>
+		<item>3 min</item>
+		<item>5 min</item>
+		<item>10 min</item>
+		<item>15 min</item>
+		<item>30 min</item>
+	</string-array>
+
 	<string-array name="quick_actions">
 		<item>@string/none</item>
 		<item>@string/recently_used</item>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 52f74aaf2..322f21f8a 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -16,7 +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="default_notification_throttling_period">-1</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/values/strings.xml b/src/main/res/values/strings.xml
index 3b943362f..804e6a697 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -418,6 +418,7 @@
     <string name="modified_conference_options">Modified group chat options!</string>
     <string name="could_not_modify_conference_options">Could not modify group chat options</string>
     <string name="never">Never</string>
+    <string name="inherit">Inherit</string>
     <string name="until_further_notice">Until further notice</string>
     <string name="snooze">Snooze</string>
     <string name="reply">Reply</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index fcf2fbb0c..8570cd1d7 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -79,6 +79,13 @@
             android:key="grace_period_length"
             android:summary="@string/pref_notification_grace_period_summary"
             android:title="@string/pref_notification_grace_period" />
+        <ListPreference
+            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"
+            android:summary="@string/pref_noisy_notifications_throttling_summary"
+            android:title="@string/pref_noisy_notifications_throttling" />
         <PreferenceScreen
             android:key="quiet_hours"
             android:summary="@string/pref_quiet_hours_summary"