diff --git a/libs/smart-card-reader-lib/src/main/java/ee/ria/DigiDoc/smartcardreader/nfc/NfcSmartCardReaderManager.java b/libs/smart-card-reader-lib/src/main/java/ee/ria/DigiDoc/smartcardreader/nfc/NfcSmartCardReaderManager.java
index ffd6a4b..bfe1799 100644
--- a/libs/smart-card-reader-lib/src/main/java/ee/ria/DigiDoc/smartcardreader/nfc/NfcSmartCardReaderManager.java
+++ b/libs/smart-card-reader-lib/src/main/java/ee/ria/DigiDoc/smartcardreader/nfc/NfcSmartCardReaderManager.java
@@ -47,6 +47,7 @@ public void disableNfcReaderMode() {
         }
         this.nfcAdapter = null;
         this.currentActivity = null;
+        this.clientCallback = null;
     }
 
     /**
@@ -96,20 +97,14 @@ public NfcStatus detectNfcStatus(Activity activity) {
      * @return - status if the NFC is available / enabled / active
      */
     public NfcStatus startDiscovery(Activity activity, NfcSmartCardReaderCallback callback) {
-        this.currentActivity = activity;
-        this.nfcAdapter = NfcAdapter.getDefaultAdapter(this.currentActivity);
-
-        if (this.nfcAdapter == null) {
-            return NfcStatus.NFC_NOT_SUPPORTED;
-        }
-
-        if (!this.nfcAdapter.isEnabled()) {
-            return NfcStatus.NFC_NOT_ACTIVE;
-        }
+        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity);
+        if (adapter == null) return NfcStatus.NFC_NOT_SUPPORTED;
+        if (!adapter.isEnabled()) return NfcStatus.NFC_NOT_ACTIVE;
 
+        this.currentActivity = activity;
+        this.nfcAdapter = adapter;
         this.clientCallback = callback;
-        this.nfcAdapter.enableReaderMode(
-                this.currentActivity, this, NfcAdapter.FLAG_READER_NFC_A, null);
+        adapter.enableReaderMode(activity, this, NfcAdapter.FLAG_READER_NFC_A, null);
         return NfcStatus.NFC_ACTIVE;
     }