diff --git a/javascript/ql/src/Comments/ForLiquidComment.ql b/javascript/ql/src/Comments/ForLiquidComment.ql
new file mode 100644
index 000000000000..3dbbbeca00da
--- /dev/null
+++ b/javascript/ql/src/Comments/ForLiquidComment.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Liquid syntax comment
+ * @description A comment that contains Liquid syntax ```{{ }}``` may indicate code that is incomplete or
+ *              broken, or it may highlight an ambiguity in the software's specification.
+ * @kind problem
+ * @problem.severity recommendation
+ * @id js/liquid-comment
+ * @tags maintainability
+ *       external/cwe/cwe-546
+ * @precision medium
+ */
+
+
+import javascript
+import semmle.javascript.YAML
+
+from HTML::CommentNode c
+where c.getText().regexpMatch("(?s).*FIXME.*|.*FUTURE\\{\\{\\D*\\}\\}BUG.*|.*(?<!=)\\s*XXX.*")
+select c, "HTML code comments should be addressed."