diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp
index 3d8c42dbb3f99290a63a61b16129c8385164bfe7..036dd48d5820f28dd416e5245b3f2aac4ce295ce 100644
--- a/services/implementation/src/authentication/dm_auth_manager.cpp
+++ b/services/implementation/src/authentication/dm_auth_manager.cpp
@@ -2459,6 +2459,10 @@ void DmAuthManager::AuthDeviceFinish(int64_t requestId)
 void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode)
 {
     LOGI("AuthDeviceError start.");
+    if (requestId != authResponseContext_->requestId) {
+        LOGE("AuthDeviceError requestId %{public}" PRId64 "is error.", requestId);
+        return;
+    }
     isAuthDevice_ = false;
     if (authRequestState_ == nullptr || authResponseState_ != nullptr) {
         if (CheckNeedShowAuthInfoDialog(errorCode)) {
@@ -2475,10 +2479,6 @@ void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode)
         return;
     }
     if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE) {
-        if (requestId != authResponseContext_->requestId) {
-            LOGE("DmAuthManager::AuthDeviceError requestId %{public}" PRId64 "is error.", requestId);
-            return;
-        }
         authResponseContext_->state = AuthState::AUTH_REQUEST_JOIN;
         authRequestContext_->reason = ERR_DM_AUTH_CODE_INCORRECT;
         authResponseContext_->reply = ERR_DM_AUTH_CODE_INCORRECT;
@@ -2511,7 +2511,7 @@ void DmAuthManager::AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessi
 {
     LOGI("DmAuthManager::AuthDeviceSessionKey start. keyLen: %{public}u", sessionKeyLen);
     if (requestId != authResponseContext_->requestId) {
-        LOGE("DmAuthManager::onTransmit requestId %{public}" PRId64 "is error.", requestId);
+        LOGE("AuthDeviceSessionKey requestId %{public}" PRId64 "is error.", requestId);
         return;
     }
     CHECK_NULL_VOID(authMessageProcessor_);
diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp
index 06a5ba958a7b03f60edd09bb48141147e1aa60c0..5d26fbc2dbe6dd88042545b06bf493a12dfb408e 100644
--- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp
+++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp
@@ -992,7 +992,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceError004, testing::ext::TestSize.Level1)
     authManager_->authResponseContext_->authType = AUTH_TYPE_UNKNOW;
     authManager_->authResponseContext_->requestId = 3;
     authManager_->authTimes_ = 3;
-    int64_t requestId = 0;
+    int64_t requestId = 3;
     int32_t errorCode = ERR_DM_FAILED;
     authManager_->AuthDeviceError(requestId, errorCode);
     ASSERT_EQ(authManager_->authResponseContext_->state, AuthState::AUTH_REQUEST_JOIN);