diff --git a/cql3/query_processor.cc b/cql3/query_processor.cc
index 4ac8d2017e..aaa472112e 100644
--- a/cql3/query_processor.cc
+++ b/cql3/query_processor.cc
@@ -38,6 +38,8 @@ using namespace transport::messages;
 
 thread_local logging::logger log("query_processor");
 
+const sstring query_processor::CQL_VERSION = "3.2.0";
+
 future<::shared_ptr<result_message>>
 query_processor::process(const sstring_view& query_string, service::query_state& query_state, query_options& options)
 {
diff --git a/cql3/query_processor.hh b/cql3/query_processor.hh
index 1f964ea7a5..3500d3bdf7 100644
--- a/cql3/query_processor.hh
+++ b/cql3/query_processor.hh
@@ -45,9 +45,9 @@ private:
 public:
     query_processor(service::storage_proxy& proxy, distributed<database>& db) : _proxy(proxy), _db(db) {}
 
-#if 0
-    public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.2.0");
+    static const sstring CQL_VERSION;
 
+#if 0
     public static final QueryProcessor instance = new QueryProcessor();
 #endif
 private:
diff --git a/transport/server.cc b/transport/server.cc
index 05101add23..eade7b76bf 100644
--- a/transport/server.cc
+++ b/transport/server.cc
@@ -506,8 +506,7 @@ future<> cql_server::connection::write_ready(int16_t stream)
 future<> cql_server::connection::write_supported(int16_t stream)
 {
     std::multimap<sstring, sstring> opts;
-    opts.insert({"CQL_VERSION", "3.0.0"});
-    opts.insert({"CQL_VERSION", "3.2.0"});
+    opts.insert({"CQL_VERSION", cql3::query_processor::CQL_VERSION});
     opts.insert({"COMPRESSION", "snappy"});
     auto response = make_shared<cql_server::response>(stream, cql_binary_opcode::SUPPORTED);
     response->write_string_multimap(opts);