diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 369a616b..1a36b3df 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -2522,6 +2522,8 @@ bool CPhoneDevice::CloseCamera()
 
         camera->close();
         delete camera;
+
+        m_powerCtrlPtr.reset();
     }
     return true;
 }
@@ -2529,6 +2531,7 @@ bool CPhoneDevice::CloseCamera()
 void CPhoneDevice::CloseCamera2(CPhoneDevice::CPhoneCamera* camera, unsigned int photoId, unsigned char cameraType)
 {
     XYLOG(XYLOG_SEVERITY_DEBUG, "TP: Start CloseCamera PHOTOID=%u", photoId);
+
     // std::this_thread::sleep_for(std::chrono::milliseconds(16));
     if (camera != NULL)
     {
@@ -2538,8 +2541,7 @@ void CPhoneDevice::CloseCamera2(CPhoneDevice::CPhoneCamera* camera, unsigned int
 
     XYLOG(XYLOG_SEVERITY_DEBUG, "TP: Will Turn Off Power PHOTOID=%u", photoId);
     {
-        std::shared_ptr<PowerControl> empty;
-        empty.swap(m_powerCtrlPtr);
+        m_powerCtrlPtr.reset();
     }
     XYLOG(XYLOG_SEVERITY_DEBUG, "TP: End Turn Off Power PHOTOID=%u", photoId);