diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp
index f986fb61..26aef24c 100644
--- a/HdmiCecSink/HdmiCecSink.cpp
+++ b/HdmiCecSink/HdmiCecSink.cpp
@@ -824,6 +824,7 @@ namespace WPEFramework
        {
            if(_powerManagerPlugin)
            {
+               _powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
                _powerManagerPlugin.Reset();
            }
            _registeredEventHandlers = false;
diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp
index 68b38a9a..e00fba1d 100644
--- a/HdmiCecSource/HdmiCecSource.cpp
+++ b/HdmiCecSource/HdmiCecSource.cpp
@@ -150,6 +150,7 @@ namespace WPEFramework
            }
 
            _connectionId = 0;
+           _service->Unregister(&_notification);
            _service->Release();
            _service = nullptr;
            LOGINFO("HdmiCecSource plugin is deactivated. Successfully deactivated HdmiCecSource Plugin");
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp
index 3660a33e..4a4e3e64 100644
--- a/HdmiCecSource/HdmiCecSourceImplementation.cpp
+++ b/HdmiCecSource/HdmiCecSourceImplementation.cpp
@@ -385,6 +385,7 @@ namespace WPEFramework
 
            if(_powerManagerPlugin)
            {
+               _powerManagerPlugin->Unregister(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
                _powerManagerPlugin.Reset();
            }
            _registeredEventHandlers = false;