diff --git a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
index e68d22a..4b76eba 100644
--- a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
+++ b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
@@ -254,14 +254,16 @@
             ScanListenerRecord scanListenerRecord =
                     new ScanListenerRecord(scanRequest, listener, callerIdentity, deathRecipient);
 
+            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             Boolean started = startProviders(scanRequest);
             if (started == null) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.UNKNOWN;
             }
             if (!started) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.ERROR;
             }
-            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             NearbyMetrics.logScanStarted(scanListenerRecord.hashCode(), scanRequest);
             if (mScanMode < scanRequest.getScanMode()) {
                 mScanMode = scanRequest.getScanMode();