diff --git a/server/src/main.rs b/server/src/main.rs
index da7a08a..b9fc5ae 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -167,6 +167,9 @@ async fn handle_query<W>(writer: &mut W, state: &SharedDbState, query: String, t
     where
         W: BackendProtoWriter + ProtoFlush + Send,
 {
+    //  Make sure token is reset before next query
+    token.reset();
+
     let operation = {
         let state = state.read().await;
         let db_schema = state.db_schema();