diff --git a/xposed-bridge/src/main/java/de/robv/android/xposed/XSharedPreferences.java b/xposed-bridge/src/main/java/de/robv/android/xposed/XSharedPreferences.java
index 82e64c1d5..1f0272bb1 100644
--- a/xposed-bridge/src/main/java/de/robv/android/xposed/XSharedPreferences.java
+++ b/xposed-bridge/src/main/java/de/robv/android/xposed/XSharedPreferences.java
@@ -483,6 +483,9 @@ public Editor edit() {
     @Deprecated
     @Override
     public void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener listener) {
+        if (!mWatcherEnabled)
+            throw new UnsupportedOperationException("File watcher feature is disabled for this instance");
+
         synchronized(this) {
             mListeners.put(listener, sContent);
         }
@@ -491,6 +494,9 @@ public void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeLis
     @Deprecated
     @Override
     public void unregisterOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener listener) {
+        if (!mWatcherEnabled)
+            throw new UnsupportedOperationException("File watcher feature is disabled for this instance");
+
         synchronized(this) {
             mListeners.remove(listener);
         }