diff --git a/lib/set_parser.cpp b/lib/set_parser.cpp
index 2d28da923..dee35200b 100644
--- a/lib/set_parser.cpp
+++ b/lib/set_parser.cpp
@@ -83,6 +83,8 @@ std::map<std::string,std::vector<std::string>> SetParser::parse1() {
 
 	re2::RE2 re0("^\\s*SET\\s+", *opt2);
 	re2::RE2::Replace(&query, re0, "");
+	re2::RE2 re2("--.*$", *opt2); // remove comments
+	re2::RE2::Replace(&query, re2, "");
 	re2::RE2 re1("(\\s|;)+$", *opt2); // remove trailing spaces and semicolon
 	re2::RE2::Replace(&query, re1, "");