diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
index 7e81b950c7..191077be6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
@@ -35,9 +35,17 @@ public class KeepAliveReceiver extends BroadcastReceiver {
 
     // TODO consider moving this into an Alarms plugin that works offline and can be configured
     // (e.g. override silent mode at night only)
-    public static final int ALARM_FREQUENCY = 25 * 60 * 1000;
-    private static long nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
-    private static long nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
+
+    private static int missedReadingsThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_missed_bg_readings_threshold), 30) * 60 * 1000;
+    }
+
+    private static int pumpUnreachableThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_pump_unreachable_threshold), 30) * 60 * 1000;
+    }
+
+    private static long nextPumpDisconnectedAlarm = System.currentTimeMillis() + pumpUnreachableThreshold();
+    private static long nextMissedReadingsAlarm = System.currentTimeMillis() + missedReadingsThreshold();
 
     @Override
     public void onReceive(Context context, Intent rIntent) {
@@ -55,11 +63,11 @@ public class KeepAliveReceiver extends BroadcastReceiver {
     private void checkBg() {
         BgReading bgReading = DatabaseHelper.lastBg();
         if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
-        && bgReading != null && bgReading.date + ALARM_FREQUENCY < System.currentTimeMillis()
+        && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
                 && nextMissedReadingsAlarm < System.currentTimeMillis()) {
             Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
             n.soundId = R.raw.alarm;
-            nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
+            nextMissedReadingsAlarm = System.currentTimeMillis() + missedReadingsThreshold();
             MainApp.bus().post(new EventNewNotification(n));
         }
     }
@@ -73,7 +81,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
             boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis();
             boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
 
-            boolean alarmTimeoutExpired = lastConnection.getTime() + ALARM_FREQUENCY < System.currentTimeMillis();
+            boolean alarmTimeoutExpired = lastConnection.getTime() + pumpUnreachableThreshold() < System.currentTimeMillis();
             boolean nextAlarmOccurrenceReached = nextPumpDisconnectedAlarm < System.currentTimeMillis();
 
             SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
@@ -81,7 +89,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                     && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached) {
                 Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
                 n.soundId = R.raw.alarm;
-                nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
+                nextPumpDisconnectedAlarm = System.currentTimeMillis() + pumpUnreachableThreshold();
                 MainApp.bus().post(new EventNewNotification(n));
             } else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
                 Thread t = new Thread(new Runnable() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2dcc1663df..4edee10b09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -764,7 +764,10 @@
     <string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
     <string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
     <string name="localalertsettings_title">Local alerts</string>
-    <string name="enable_missed_bg_readings_alert">Alert if no BGs received in 30 min</string>
-    <string name="enable_pump_unreachable_alert">Alert if pump unreachable for 30 min</string>
+    <string name="enable_missed_bg_readings_alert">Alert if no BG data is received</string>
+    <string name="enable_pump_unreachable_alert">Alert if pump is unreachable</string>
+    <string name="pump_unreachable_threshold">Pump unreachable threshold [min]</string>
+    <string name="key_pump_unreachable_threshold" translatable="false">pump_unreachable_threshold</string>
+    <string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
 </resources>
 
diff --git a/app/src/main/res/xml/pref_others.xml b/app/src/main/res/xml/pref_others.xml
index 2053859b5e..8e4f0d1731 100644
--- a/app/src/main/res/xml/pref_others.xml
+++ b/app/src/main/res/xml/pref_others.xml
@@ -79,10 +79,24 @@
             android:defaultValue="false"
             android:key="@string/key_enable_missed_bg_readings_alert"
             android:title="@string/enable_missed_bg_readings_alert"/>
+        <EditTextPreference
+            android:title="@string/nsalarm_staledatavalue_label"
+            android:key="@string/key_missed_bg_readings_threshold"
+            android:dependency="@string/key_enable_missed_bg_readings_alert"
+            android:defaultValue="30"
+            android:inputType="number">
+        </EditTextPreference>
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_enable_pump_unreachable_alert"
             android:title="@string/enable_pump_unreachable_alert"/>
+        <EditTextPreference
+            android:title="@string/pump_unreachable_threshold"
+            android:key="@string/key_pump_unreachable_threshold"
+            android:dependency="@string/key_enable_pump_unreachable_alert"
+            android:defaultValue="30"
+            android:inputType="number">
+        </EditTextPreference>
         <SwitchPreference
             android:defaultValue="false"
             android:key="raise_urgent_alarms_as_android_notification"