diff --git a/frameworks/native/bluetoothclient/audio_bluetooth_manager.cpp b/frameworks/native/bluetoothclient/audio_bluetooth_manager.cpp
index 318ba256c45ac6d0f33255cc618ebb272f81ba2d..f9dbd7899ae6c4362593d5fd35c90e4fecb3e236 100644
--- a/frameworks/native/bluetoothclient/audio_bluetooth_manager.cpp
+++ b/frameworks/native/bluetoothclient/audio_bluetooth_manager.cpp
@@ -465,7 +465,7 @@ int32_t AudioHfpManager::SetActiveHfpDevice(const std::string &macAddress)
     AudioXCollie audioXCollie("AudioHfpManager::SetActiveHfpDevice", BT_SET_ACTIVE_DEVICE_TIMEOUT,
         nullptr, nullptr, AUDIO_XCOLLIE_FLAG_LOG | AUDIO_XCOLLIE_FLAG_RECOVERY);
     BluetoothRemoteDevice device;
-    if (HfpBluetoothDeviceManager::GetConnectedHfpBluetoothDevice(macAddress, device) != SUCCESS) {
+    if (macAddress != "" && HfpBluetoothDeviceManager::GetConnectedHfpBluetoothDevice(macAddress, device) != SUCCESS) {
         AUDIO_ERR_LOG("SetActiveHfpDevice failed for the HFP device, %{public}s does not exist.",
             GetEncryptAddr(macAddress).c_str());
         return ERROR;
diff --git a/frameworks/native/bluetoothclient/test/bluetooth_hfp_manager_test.cpp b/frameworks/native/bluetoothclient/test/bluetooth_hfp_manager_test.cpp
index dfae106e0ca4b14b6b96934a8000507834abcd5e..ab75aac6951650d9643ad89c698ebfb595bba0f4 100644
--- a/frameworks/native/bluetoothclient/test/bluetooth_hfp_manager_test.cpp
+++ b/frameworks/native/bluetoothclient/test/bluetooth_hfp_manager_test.cpp
@@ -83,6 +83,7 @@ HWTEST_F(BluetoothHfpManagerTest, BluetoothHfpManagerTest_001, TestSize.Level1)
     EXPECT_NE(AudioHfpManager::SetActiveHfpDevice("33:33:33"), SUCCESS);
     EXPECT_EQ(AudioHfpManager::SetActiveHfpDevice(HFP_DEVICE_MAC1), SUCCESS);
     EXPECT_EQ(AudioHfpManager::SetActiveHfpDevice(HFP_DEVICE_MAC2), SUCCESS);
+    EXPECT_EQ(AudioHfpManager::SetActiveHfpDevice(""), SUCCESS);
 }
 
 /**
diff --git a/services/audio_policy/server/domain/device/src/sle/sle_audio_device_manager.cpp b/services/audio_policy/server/domain/device/src/sle/sle_audio_device_manager.cpp
index 0693521cdfc1253d221770f3579ad84eafaba5a6..8f923bd5fe93f96cb94fba1ed85f302e4d21235d 100644
--- a/services/audio_policy/server/domain/device/src/sle/sle_audio_device_manager.cpp
+++ b/services/audio_policy/server/domain/device/src/sle/sle_audio_device_manager.cpp
@@ -100,7 +100,8 @@ int32_t SleAudioDeviceManager::StartPlaying(const std::string &device, uint32_t
 {
     CHECK_AND_RETURN_RET_LOG(callback_ != nullptr, ERR_INVALID_PARAM, "callback is nullptr");
 
-    AUDIO_INFO_LOG("sle streamType %{public}u", streamType);
+    AUDIO_INFO_LOG("device [%{public}s] sle streamType [%{public}u]",
+        AudioPolicyUtils::GetInstance().GetEncryptAddr(device).c_str(), streamType);
     std::lock_guard<std::mutex> lock(startedSleStreamTypeMutex_);
     int32_t ret = ERROR;
     if (!startedSleStreamType_[device][streamType].empty()) {
@@ -116,7 +117,8 @@ int32_t SleAudioDeviceManager::StopPlaying(const std::string &device, uint32_t s
     CHECK_AND_RETURN_RET_LOG(callback_ != nullptr, ERR_INVALID_PARAM, "callback is nullptr");
 
     int32_t ret = ERROR;
-    AUDIO_INFO_LOG("sle streamType %{public}u", streamType);
+    AUDIO_INFO_LOG("device [%{public}s] sle streamType [%{public}u]",
+        AudioPolicyUtils::GetInstance().GetEncryptAddr(device).c_str(), streamType);
     callback_->StopPlaying(device, streamType, ret);
     return ret;
 }
@@ -385,8 +387,7 @@ void SleAudioDeviceManager::ResetSleStreamTypeCount(const std::shared_ptr<AudioD
         StopPlaying(deviceDesc->macAddress_, streamType);
     }
 
-    auto ret = SetActiveSinkDevice(deviceDesc->macAddress_, SLE_AUDIO_STREAM_NONE);
-    CHECK_AND_RETURN_LOG(ret == SUCCESS, "set active device failed, ret: %{public}d", ret);
+    SetActiveSinkDevice(deviceDesc->macAddress_, SLE_AUDIO_STREAM_NONE);
 
     startedSleStreamType_.erase(it);
 }
diff --git a/services/audio_policy/server/service/service_main/include/audio_core_service.h b/services/audio_policy/server/service/service_main/include/audio_core_service.h
index 031b12a4d364ea769cd0122b1592630e860638e3..22fc43399b6f799a5971f213617da0fa4d1e197b 100644
--- a/services/audio_policy/server/service/service_main/include/audio_core_service.h
+++ b/services/audio_policy/server/service/service_main/include/audio_core_service.h
@@ -509,7 +509,7 @@ private:
     void UpdateRemoteOffloadModuleName(std::shared_ptr<AudioPipeInfo> pipeInfo, std::string &moduleName);
     void UpdateOffloadState(std::shared_ptr<AudioPipeInfo> pipeInfo);
     void NotifyRouteUpdate(const std::vector<std::shared_ptr<AudioStreamDescriptor>> &streamDescs);
-    void ResetNearlinkDeviceState(const std::shared_ptr<AudioDeviceDescriptor> &deviceDesc);
+    void ResetNearlinkDeviceState(const std::shared_ptr<AudioDeviceDescriptor> &deviceDesc, bool isRunning = true);
 
     // For offload
     void CheckAndUpdateOffloadEnableForStream(
diff --git a/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp b/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp
index 3adf00b374ee7ca462d5c44573c3097f4a80f433..5811f51c2c3e1fe1e374b8d4a90224b064c0f45a 100644
--- a/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp
+++ b/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp
@@ -555,7 +555,7 @@ int32_t AudioCoreService::BluetoothDeviceFetchOutputHandle(shared_ptr<AudioStrea
     std::shared_ptr<AudioDeviceDescriptor> desc = streamDesc->newDeviceDescs_.front();
     CHECK_AND_RETURN_RET_LOG(desc != nullptr, BLUETOOTH_FETCH_RESULT_CONTINUE, "Device desc is nullptr");
 
-    ResetNearlinkDeviceState(desc);
+    ResetNearlinkDeviceState(desc, streamDesc->streamStatus_ == STREAM_STATUS_STARTED);
 
     if (desc->deviceType_ == DEVICE_TYPE_BLUETOOTH_A2DP) {
         std::string sinkPort = AudioPolicyUtils::GetInstance().GetSinkPortName(DEVICE_TYPE_BLUETOOTH_A2DP);
@@ -2894,8 +2894,11 @@ bool AudioCoreService::IsFastAllowed(std::string &bundleName)
     return true;
 }
 
-void AudioCoreService::ResetNearlinkDeviceState(const std::shared_ptr<AudioDeviceDescriptor> &deviceDesc)
+void AudioCoreService::ResetNearlinkDeviceState(const std::shared_ptr<AudioDeviceDescriptor> &deviceDesc,
+    bool isRunning)
 {
+    CHECK_AND_RETURN(isRunning);
+
     CHECK_AND_RETURN_LOG(deviceDesc != nullptr, "deviceDesc is nullptr");
 
     auto currentOutputDevice = audioActiveDevice_.GetCurrentOutputDevice();
@@ -2945,10 +2948,11 @@ int32_t AudioCoreService::ActivateNearlinkDevice(const std::shared_ptr<AudioStre
             AudioServerProxy::GetInstance().SetDmDeviceTypeProxy(DM_DEVICE_TYPE_NEARLINK_SCO, DEVICE_TYPE_NEARLINK_IN);
         }
 
-        ResetNearlinkDeviceState(deviceDesc);
+        ResetNearlinkDeviceState(deviceDesc, isRunning);
 
         std::string sinkPort = AudioPolicyUtils::GetInstance().GetSinkPortName(DEVICE_TYPE_BLUETOOTH_A2DP);
         audioPolicyManager_.SuspendAudioDevice(sinkPort, true);
+        Bluetooth::AudioHfpManager::SetActiveHfpDevice("");
 
         int32_t result = std::visit(runDeviceActivationFlow, audioStreamConfig);
         if (result != SUCCESS) {