diff --git a/.changeset/html-self-closing-raw-text.md b/.changeset/html-self-closing-raw-text.md
new file mode 100644
index 000000000..6e12877fc
--- /dev/null
+++ b/.changeset/html-self-closing-raw-text.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/html": patch
+---
+
+Fix the tokenizer staying in raw text mode after a self-closing raw text element such as `<textarea />`, which swallowed the rest of the template as text.
diff --git a/packages/html/src/tokenize.ts b/packages/html/src/tokenize.ts
index 6a0df68db..c7017a728 100644
--- a/packages/html/src/tokenize.ts
+++ b/packages/html/src/tokenize.ts
@@ -157,6 +157,7 @@ export const tokenize = (
             // ">"
             if (
               rawTextElements.has(lastTagName) &&
+              tokens[tokens.length - 1]?.type !== SLASH_TOKEN &&
               tokens[tokens.length - 2]?.type !== SLASH_TOKEN
             ) {
               state = STATE_RAW_TEXT;
diff --git a/packages/html/test/parse.test.ts b/packages/html/test/parse.test.ts
index 24c5cae07..4a6877c38 100644
--- a/packages/html/test/parse.test.ts
+++ b/packages/html/test/parse.test.ts
@@ -526,6 +526,22 @@ describe("Specialized Element AST", () => {
     });
   });
 
+  it("raw text elements: self-closing textarea inside an element", () => {
+    const ast = jsx`<div><textarea /></div>`;
+
+    expect(ast).toEqual({
+      type: ROOT_NODE,
+      children: [
+        {
+          type: ELEMENT_NODE,
+          name: "div",
+          props: [],
+          children: [{ type: ELEMENT_NODE, name: "textarea", props: [], children: [] }]
+        }
+      ]
+    });
+  });
+
   it("comments: braced comment ignored", () => {
     const ast = jsx`<div>{/* a comment */}hello</div>`;
 
diff --git a/packages/html/test/tokenize.test.ts b/packages/html/test/tokenize.test.ts
index 5e52a8153..eb6088b13 100644
--- a/packages/html/test/tokenize.test.ts
+++ b/packages/html/test/tokenize.test.ts
@@ -853,6 +853,23 @@ describe("handling of raw text elements", () => {
       { type: TEXT_TOKEN, value: "Text" }
     ]);
   });
+
+  it("should exit raw text mode after a self-closing raw text element", () => {
+    const tokens = tokenizeTemplate`<div><textarea /></div>`;
+    expect(tokens).toEqual([
+      { type: OPEN_TAG_TOKEN },
+      { type: IDENTIFIER_TOKEN, value: "div" },
+      { type: CLOSE_TAG_TOKEN },
+      { type: OPEN_TAG_TOKEN },
+      { type: IDENTIFIER_TOKEN, value: "textarea" },
+      { type: SLASH_TOKEN },
+      { type: CLOSE_TAG_TOKEN },
+      { type: OPEN_TAG_TOKEN },
+      { type: SLASH_TOKEN },
+      { type: IDENTIFIER_TOKEN, value: "div" },
+      { type: CLOSE_TAG_TOKEN }
+    ]);
+  });
 });
 
 describe("dynamic component tags", () => {