diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Changelog for persistent-qq
 
+## 2.12.0.5
+
+* Fix a bug where comments would break the quasiquoter. [#1436](https://github.com/yesodweb/persistent/pull/1436)
+
 ## 2.12.0.4
 
 * Improve compile-time performance of generated code, especially when building with -O2.
diff --git a/persistent-qq.cabal b/persistent-qq.cabal
--- a/persistent-qq.cabal
+++ b/persistent-qq.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 name:           persistent-qq
-version:        2.12.0.4
+version:        2.12.0.5
 synopsis:       Provides a quasi-quoter for raw SQL for persistent
 description:    Please see README and API docs at <http://www.stackage.org/package/persistent>.
 category:       Database, Yesod
diff --git a/src/Database/Persist/Sql/Raw/QQ.hs b/src/Database/Persist/Sql/Raw/QQ.hs
--- a/src/Database/Persist/Sql/Raw/QQ.hs
+++ b/src/Database/Persist/Sql/Raw/QQ.hs
@@ -92,8 +92,6 @@
 parseStr a ('*':'{':xs) = Literal (reverse a) : parseHaskell Rows       [] xs
 parseStr a ('^':'{':xs) = Literal (reverse a) : parseHaskell TableName  [] xs
 parseStr a ('@':'{':xs) = Literal (reverse a) : parseHaskell ColumnName [] xs
-parseStr a (' ':' ': xs)= parseStr a (' ' : xs)
-parseStr a ('\n' : xs)  = parseStr a xs
 parseStr a (x:xs)       = parseStr (x:a) xs
 
 interpolateValues :: PersistField a => NonEmpty a -> (String, [[PersistValue]]) -> (String, [[PersistValue]])
diff --git a/test/CodeGenTest.hs b/test/CodeGenTest.hs
--- a/test/CodeGenTest.hs
+++ b/test/CodeGenTest.hs
@@ -31,7 +31,7 @@
             #{int} +
             #{int} +
             #{int} +
-            #{int} +
+            #{int} + -- comments work ok
             #{int} +
             #{int} +
                 0