1 files changed, 2 insertions, 8 deletions

diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs
index 815b75f..97532b5 100644..100755
--- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs
+++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcTagAdapter.cs
@@ -40,24 +40,17 @@ namespace Tizen.Network.Nfc
         {
             add
             {
-                if (_tagDiscovered == null)
-                {
-                    RegisterTagDiscoveredEvent();
-                }
                 _tagDiscovered += value;
             }
             remove
             {
                 _tagDiscovered -= value;
-                if (_tagDiscovered == null)
-                {
-                    UnregisterTagDiscoveredEvent();
-                }
             }
         }
 
         internal NfcTagAdapter()
         {
+            RegisterTagDiscoveredEvent();
         }
 
         ~NfcTagAdapter()
@@ -79,6 +72,7 @@ namespace Tizen.Network.Nfc
             if (disposing)
             {
                 // Free managed objects.
+                UnregisterTagDiscoveredEvent();
             }
             //Free unmanaged objects
             disposed = true;