diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb
index d1a87eea1..651216ac6 100644
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -63,7 +63,7 @@ def split(input, pattern)
     end
 
     def strip_html(input)
-      input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<.*?>/, '')
+      input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<!--.*?-->/, '').gsub(/<.*?>/, '')
     end
 
     # Remove all newlines from the string
diff --git a/test/liquid/filter_test.rb b/test/liquid/filter_test.rb
index 3c81aa6b5..f24a70c54 100644
--- a/test/liquid/filter_test.rb
+++ b/test/liquid/filter_test.rb
@@ -75,6 +75,12 @@ def test_strip_html
     assert_equal "bla blub", Variable.new("var | strip_html").render(@context)
   end
 
+  def test_strip_html_ignore_comments_with_html
+    @context['var'] = "<!-- split and some <ul> tag --><b>bla blub</a>"
+
+    assert_equal "bla blub", Variable.new("var | strip_html").render(@context)
+  end
+
   def test_capitalize
     @context['var'] = "blub"