diff --git a/Libraries/LibWeb/Parser/HTMLTokenizer.cpp b/Libraries/LibWeb/Parser/HTMLTokenizer.cpp
index 82c933ce86..eace42d309 100644
--- a/Libraries/LibWeb/Parser/HTMLTokenizer.cpp
+++ b/Libraries/LibWeb/Parser/HTMLTokenizer.cpp
@@ -66,11 +66,16 @@
 
 #define BEGIN_STATE(state) \
     state:                 \
-    case State::state:
+    case State::state: {   \
+        {                  \
+            {
 
 #define END_STATE         \
     ASSERT_NOT_REACHED(); \
-    break;
+    break;                \
+    }                     \
+    }                     \
+    }
 
 namespace Web {
 
@@ -494,6 +499,7 @@ void HTMLTokenizer::run()
                     continue;
                 }
             }
+            END_STATE
 
             BEGIN_STATE(CommentEnd)
             {
@@ -562,6 +568,7 @@ void HTMLTokenizer::run()
                     RECONSUME_IN(Comment);
                 }
             }
+            END_STATE
 
             BEGIN_STATE(CommentLessThanSign)
             {