1 files changed, 7 insertions, 2 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index 99d23e33674..ab30802d16e 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -168,7 +168,10 @@ pub fn parse_html(document: JSRef<Document>,
     let parser = ServoHTMLParser::new(Some(url.clone()), document).root();
     let parser: JSRef<ServoHTMLParser> = *parser;
 
-    task_state::enter(IN_HTML_PARSER);
+    let nested_parse = task_state::get().contains(task_state::IN_HTML_PARSER);
+    if !nested_parse {
+        task_state::enter(IN_HTML_PARSER);
+    }
 
     match input {
         HTMLInput::InputString(s) => {
@@ -201,7 +204,9 @@ pub fn parse_html(document: JSRef<Document>,
 
     parser.finish();
 
-    task_state::exit(IN_HTML_PARSER);
+    if !nested_parse {
+        task_state::exit(IN_HTML_PARSER);
+    }
 
     debug!("finished parsing");
 }