diff --git a/cql3/Cql.g b/cql3/Cql.g
index 3c76ec1493..853d68d3d0 100644
--- a/cql3/Cql.g
+++ b/cql3/Cql.g
@@ -125,6 +125,7 @@ struct uninitialized {
     uninitialized& operator=(uninitialized&&) = default;
     operator const T&() const & { return check(), *_val; }
     operator T&&() && { return check(), std::move(*_val); }
+    operator std::optional<T>&&() && { return check(), std::move(_val); }
     void check() const { if (!_val) { throw std::runtime_error("not intitialized"); } }
 };