diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17990a54c..49527d804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 #### Version 0.31.0 (NEXT)
 * Pebble: Send all wearable notification actions (not only reply)
 * Pebble: Always allow reply action even if untested features are turned off
+* Pebble: Temporarily disable broken autoremove notification feature
 * Amazfit Bip: Allow flashing latest gps firmware (Mili_dth.gps)
 * Mi Band 3/Amazfit Bip/Amazfit Cor: Send Fahrenheit if units are set to imperial
 * Roidmi 3: Fix and enable support
@@ -10,6 +11,7 @@
 * Prevent re-sending old notifications to the wearable
 * Enhancement and Fixes for Bengali Transliteration
 
+
 #### Version 0.30.0
 * Amazfit Bip + Mi Band 3: Support for right to left display (configurable) (#976)
 * Add Arabic, Bengali Farsi, Persian, Scandinavian transliteration
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index fce9886c3..8b55644b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -396,7 +396,7 @@ public class NotificationListener extends NotificationListenerService {
 
     @Override
     public void onNotificationRemoved(StatusBarNotification sbn) {
-        if (shouldIgnore(sbn))
+        if (shouldIgnore(sbn) || true)  // FIXME: DISABLED for now
             return;
 
         Prefs prefs = GBApplication.getPrefs();
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5ae7e772d..95c8cd731 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -379,12 +379,14 @@
                     android:key="pebble_reconnect_attempts"
                     android:maxLength="4"
                     android:title="@string/pref_title_pebble_reconnect_attempts" />
+<!--
                 <CheckBoxPreference
             android:layout="@layout/preference_checkbox"
                     android:defaultValue="false"
                     android:key="autoremove_notifications"
                     android:summary="@string/pref_summary_autoremove_notifications"
                     android:title="@string/pref_title_autoremove_notifications" />
+-->
                 <ListPreference
                     android:key="pebble_pref_privacy_mode"
                     android:title="@string/pref_title_pebble_privacy_mode"