diff --git a/sql/hive-thriftserver/v2.3/src/main/java/org/apache/hive/service/server/HiveServer2.java b/sql/hive-thriftserver/v2.3/src/main/java/org/apache/hive/service/server/HiveServer2.java
index 108af6aba59bb..1b2eb0befb53b 100644
--- a/sql/hive-thriftserver/v2.3/src/main/java/org/apache/hive/service/server/HiveServer2.java
+++ b/sql/hive-thriftserver/v2.3/src/main/java/org/apache/hive/service/server/HiveServer2.java
@@ -185,8 +185,11 @@ private void addServerInstanceToZooKeeper(HiveConf hiveConf) throws Exception {
             + ZOOKEEPER_PATH_SEPARATOR + queue + ZOOKEEPER_PATH_SEPARATOR + ephemeralPath;
     LOG.info("Add server instance to zookeeper on {}", zkPath);
     try {
+      String data = "{\"tag\":[]}";
       String queueTag = hiveConf.get("spark.yarn.queue.tag", "");
-      String data = "{\"tag\":[\"" + queueTag + "\"]}"; // schedule
+      if (StringUtils.isNotBlank(queueTag)) {
+        data = "{\"tag\":[\"" + queueTag + "\"]}"; // schedule
+      }
       znode = new PersistentEphemeralNode(zooKeeperClient,
               Mode.EPHEMERAL, zkPath, data.getBytes(StandardCharsets.UTF_8));
       znode.start();