diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java b/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java
index 720122971d350..7dfb30e698019 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/BranchManager.java
@@ -107,7 +107,7 @@ branchName, branchPath(tablePath, branchName)),
 
     public void createBranch(String branchName, String tagName) {
         validateBranch(branchName);
-        Snapshot snapshot = tagManager.getOrThrow(tagName);
+        Snapshot snapshot = tagManager.getOrThrow(tagName).trimToSnapshot();
 
         try {
             // Copy the corresponding tag, snapshot and schema files into the branch directory
diff --git a/paimon-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java b/paimon-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java
index 2ed15c0ce7d35..ecb42d7669012 100644
--- a/paimon-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java
+++ b/paimon-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java
@@ -1138,9 +1138,9 @@ public void testCreateSameTagName() throws Exception {
             assertThat(tagManager.tagExists("test-tag")).isTrue();
             // Create again failed if tag existed
             Assertions.assertThatThrownBy(() -> table.createTag("test-tag", 1))
-                    .hasMessageContaining("Tag name 'test-tag' already exists.");
+                    .hasMessageContaining("Tag 'test-tag' already exists.");
             Assertions.assertThatThrownBy(() -> table.createTag("test-tag", 2))
-                    .hasMessageContaining("Tag name 'test-tag' already exists.");
+                    .hasMessageContaining("Tag 'test-tag' already exists.");
         }
     }
 
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/ReplaceTagActionTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/ReplaceTagActionTest.java
index ab787f495b7ab..8b14afdd7d1ad 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/ReplaceTagActionTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/ReplaceTagActionTest.java
@@ -55,7 +55,7 @@ public void testReplaceTag() throws Exception {
                         () ->
                                 bEnv.executeSql(
                                         "CALL sys.replace_tag(`table` => 'default.T', tag => 'test_tag')"))
-                .hasMessageContaining("Tag name 'test_tag' does not exist.");
+                .hasMessageContaining("Tag 'test_tag' doesn't exist.");
 
         bEnv.executeSql("CALL sys.create_tag(`table` => 'default.T', tag => 'test_tag')");
         assertThat(tagManager.tagExists("test_tag")).isEqualTo(true);