diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 1558de37ea..989021eb52 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -593,16 +593,11 @@ static void rpcReleaseConn(SRpcConn *pConn) {
 
 static void rpcCloseConn(void *thandle) {
   SRpcConn *pConn = (SRpcConn *)thandle;
-  if (pConn->user[0] == 0) return;
 
   rpcLockConn(pConn);
 
-  if (pConn->user[0] == 0) {
-    rpcUnlockConn(pConn);
-    return;
-  }
-
-  rpcReleaseConn(pConn);
+  if (pConn->user[0])
+    rpcReleaseConn(pConn);
 
   rpcUnlockConn(pConn);
 }