diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
index 5e7afd1f7..b71591bba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -482,7 +482,12 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
             LOG.warn("newLeScanCallback == null!");
             return;
         }
-        bluetoothLeScanner.stopScan(newLeScanCallback);
+        try {
+            bluetoothLeScanner.stopScan(newLeScanCallback);
+        } catch (NullPointerException e) {
+            LOG.warn("Internal NullPointerException when stopping the scan!");
+            return;
+        }
     }
 
     private void bluetoothStateChanged(int newState) {