diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
index 27858f3b7..541dab53a 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java
@@ -189,14 +189,16 @@ public class HtmlUtil {
 			regex = StrUtil.format("(?i)(\\s*{}\\s*=\\s*)" +
 				"(" +
 				// name="xxxx"
-				"([\"][^\"]+?[\"]\\s*)|" +
-				// name=xxx >
-				"([^>]+?\\s+(?=>))|" +
-				// name=xxx> 或者 name=xxx name2=xxx
-				"([^>]+?(?=\\s|>))" +
+				"([\"][^\"]+?[\"])|" +
+				// name=xxx > 或者 name=xxx> 或者 name=xxx name2=xxx
+				"([^>]+?\\s*(?=\\s|>))" +
 				")", attr);
 			content = content.replaceAll(regex, StrUtil.EMPTY);
 		}
+
+		// issue#I8YV0K 去除尾部空格
+		content = ReUtil.replaceAll(content, "\\s+(>|/>)", "$1");
+
 		return content;
 	}
 
diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java
index aa9d66250..81d66525c 100644
--- a/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java
+++ b/hutool-http/src/test/java/org/dromara/hutool/http/html/IssueI8YV0KTest.java
@@ -15,4 +15,10 @@ public class IssueI8YV0KTest {
 		final String str = "<content styleCode=\"xmChange\"/>";
 		Assertions.assertEquals("<content/>", HtmlUtil.removeHtmlAttr(str, "styleCode"));
 	}
+
+	@Test
+	public void removeHtmlAttrTest3(){
+		final String str = "<content styleCode=\"dada ada\" data=\"dsad\" >";
+		Assertions.assertEquals("<content data=\"dsad\">", HtmlUtil.removeHtmlAttr(str, "styleCode"));
+	}
 }