diff --git a/frameworks/native/hdiadapter_new/manager/hdi_adapter_manager.cpp b/frameworks/native/hdiadapter_new/manager/hdi_adapter_manager.cpp
index 3f84d2d837b66eea811e307ef8f2f96006c00d6f..ebddf1fa2a9984fef38f94dcabc9f0efec53c421 100644
--- a/frameworks/native/hdiadapter_new/manager/hdi_adapter_manager.cpp
+++ b/frameworks/native/hdiadapter_new/manager/hdi_adapter_manager.cpp
@@ -138,7 +138,7 @@ std::shared_ptr<IAudioRenderSink> HdiAdapterManager::GetRenderSink(uint32_t rend
         return renderSinks_[renderId].sink_;
     }
     if (!tryCreate) {
-        AUDIO_ERR_LOG("no available sink, renderId: %{public}u", renderId);
+        AUDIO_WARNING_LOG("no available sink, renderId: %{public}u", renderId);
         return nullptr;
     }
     AUDIO_INFO_LOG("create sink, renderId: %{public}u", renderId);
@@ -163,7 +163,7 @@ std::shared_ptr<IAudioCaptureSource> HdiAdapterManager::GetCaptureSource(uint32_
         return captureSources_[captureId].source_;
     }
     if (!tryCreate) {
-        AUDIO_ERR_LOG("no available source, captureId: %{public}u", captureId);
+        AUDIO_WARNING_LOG("no available source, captureId: %{public}u", captureId);
         return nullptr;
     }
     AUDIO_INFO_LOG("create source, captureId: %{public}u", captureId);
diff --git a/interfaces/inner_api/native/audiocommon/include/audio_errors.h b/interfaces/inner_api/native/audiocommon/include/audio_errors.h
index b41f8250d0219746351b43c4a287fdeddc3d608e..6b9fd92c66ad6c67e7e87e575b3e91a0647444bc 100644
--- a/interfaces/inner_api/native/audiocommon/include/audio_errors.h
+++ b/interfaces/inner_api/native/audiocommon/include/audio_errors.h
@@ -182,6 +182,9 @@ const int32_t ERR_SET_VOL_FAILED_BY_VOLUME_CONTROL_DISABLED = BASE_AUDIO_ERR_OFF
 
 /** Unknown error */
 const int32_t  ERR_UNKNOWN = BASE_AUDIO_ERR_OFFSET - 200;
+
+/** success but not continue */
+const int32_t SUCCESS_BUT_NOT_CONTINUE = BASE_AUDIO_ERR_OFFSET - 300;
 }  // namespace AudioStandard
 }  // namespace OHOS
 #endif  // AUDIO_ERRORS_H
diff --git a/services/audio_policy/server/domain/device/src/audio_device_status.cpp b/services/audio_policy/server/domain/device/src/audio_device_status.cpp
index 1f309eb6751acf330c2f250abe2e0c6a682fbfa4..4f6d713e1eba4ae05de356e6a7dbe9ad551c371f 100644
--- a/services/audio_policy/server/domain/device/src/audio_device_status.cpp
+++ b/services/audio_policy/server/domain/device/src/audio_device_status.cpp
@@ -948,8 +948,17 @@ int32_t AudioDeviceStatus::HandleDistributedDeviceUpdate(DStatusInfo &statusInfo
     audioVolumeManager_.UpdateGroupInfo(INTERRUPT_TYPE, GROUP_NAME_DEFAULT, deviceDesc.interruptGroupId_, networkId,
         statusInfo.isConnected, statusInfo.mappingInterruptId);
     if (statusInfo.isConnected) {
-        if (audioConnectedDevice_.GetConnectedDeviceByType(networkId, devType) != nullptr) {
-            return ERROR;
+        std::shared_ptr<AudioDeviceDescriptor> connDevDesc = audioConnectedDevice_.GetConnectedDeviceByType(networkId,
+            devType);
+        if (connDevDesc != nullptr) {
+            CHECK_AND_RETURN_RET(!statusInfo.streamInfo.empty(), ERROR);
+
+            // Remote device may connect twice, and device capability will be carried in either time. So we need to
+            // update device capability even if device is already connected, and return not success to avoid doing 
+            // other connection logic.
+            connDevDesc->SetDeviceCapability(statusInfo.streamInfo, 0);
+            AUDIO_INFO_LOG("Update capability");
+            return SUCCESS_BUT_NOT_CONTINUE;
         }
         int32_t ret = ActivateNewDevice(statusInfo.networkId, devType,
             statusInfo.connectType == ConnectType::CONNECT_TYPE_DISTRIBUTED);
diff --git a/services/audio_policy/test/unittest/audio_device_status_unit_test/src/audio_device_status_unit_test.cpp b/services/audio_policy/test/unittest/audio_device_status_unit_test/src/audio_device_status_unit_test.cpp
index 40b6de9a1e7f392db7f197ae8bf264a1fda0717e..539735fc68670a7849d73c0503f468ae05159f72 100644
--- a/services/audio_policy/test/unittest/audio_device_status_unit_test/src/audio_device_status_unit_test.cpp
+++ b/services/audio_policy/test/unittest/audio_device_status_unit_test/src/audio_device_status_unit_test.cpp
@@ -301,6 +301,25 @@ HWTEST_F(AudioDeviceStatusUnitTest, AudioDeviceStatus_008, TestSize.Level1)
     reason = AudioStreamDeviceChangeReasonExt::ExtEnum::UNKNOWN;
     ret = audioDeviceStatus.HandleDistributedDeviceUpdate(statusInfo, descForCb, reason);
     EXPECT_EQ(ret, SUCCESS);
+
+    DeviceStreamInfo deviceStreamInfo = {};
+    std::list<DeviceStreamInfo> streamInfoList = { deviceStreamInfo };
+    statusInfo.streamInfo = streamInfoList;
+    std::string testNetworkId = "testNetworkId_0";
+    auto res = strncpy_s(statusInfo.networkId, NETWORK_ID_SIZE, testNetworkId.c_str(), testNetworkId.size());
+    EXPECT_EQ(res, 0);
+    DeviceType devType = audioDeviceStatus.GetDeviceTypeFromPin(statusInfo.hdiPin);
+    std::shared_ptr<AudioDeviceDescriptor> audioDescriptor =
+        std::make_shared<AudioDeviceDescriptor>(devType, OUTPUT_DEVICE);
+    audioDescriptor->networkId_ = statusInfo.networkId;
+    audioDeviceStatus.audioConnectedDevice_.AddConnectedDevice(audioDescriptor);
+
+    statusInfo.isConnected = true;
+    reason = AudioStreamDeviceChangeReasonExt::ExtEnum::UNKNOWN;
+    ret = audioDeviceStatus.HandleDistributedDeviceUpdate(statusInfo, descForCb, reason);
+    audioDeviceStatus.audioConnectedDevice_.DelConnectedDevice(audioDescriptor->networkId_,
+        audioDescriptor->deviceType_);
+    EXPECT_EQ(ret, SUCCESS_BUT_NOT_CONTINUE);
 }
 
 /**