1 files changed, 2 insertions, 8 deletions

diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs
index 25af7d4..646f178 100644..100755
--- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs
+++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcP2pAdapter.cs
@@ -40,24 +40,17 @@ namespace Tizen.Network.Nfc
         {
             add
             {
-                if (_p2pTargetDiscovered == null)
-                {
-                    RegisterP2pTargetDiscoveredEvent();
-                }
                 _p2pTargetDiscovered += value;
             }
             remove
             {
                 _p2pTargetDiscovered -= value;
-                if (_p2pTargetDiscovered == null)
-                {
-                    UnregisterP2pTargetDiscoveredEvent();
-                }
             }
         }
 
         internal NfcP2pAdapter()
         {
+            RegisterP2pTargetDiscoveredEvent();
         }
 
         ~NfcP2pAdapter()
@@ -79,6 +72,7 @@ namespace Tizen.Network.Nfc
             if (disposing)
             {
                 // Free managed objects.
+                UnregisterP2pTargetDiscoveredEvent();
             }
             //Free unmanaged objects
             disposed = true;