diff --git a/lib/shared/sdk/index.js b/lib/shared/sdk/index.js
index dcbc514e..1e7f5a8e 100644
--- a/lib/shared/sdk/index.js
+++ b/lib/shared/sdk/index.js
@@ -180,7 +180,6 @@ SDK.Scanner = class Scanner extends EventEmitter {
     }
 
     this.adapters.forEach((adapter) => {
-      // Adapter.stopScan()
       adapter.removeListener('devices', this.onDevices)
       adapter.removeListener('error', this.onError)
     })
@@ -231,6 +230,9 @@ SDK.Scanner = class Scanner extends EventEmitter {
       return this
     }
 
+    instance.removeListener('devices', this.onDevices)
+    instance.removeListener('error', this.onError)
+
     this.adapters.delete(instance.name)
     this.emit('unsubscribe', adapter)