diff --git a/api/models/base.py b/api/models/base.py
index 0c2963b0e4..60a316c42f 100644
--- a/api/models/base.py
+++ b/api/models/base.py
@@ -1,6 +1,7 @@
+from flask_sqlalchemy.query import Query
 from sqlalchemy.orm import declarative_base
 
 from models.engine import db, metadata
 
 Base = declarative_base(metadata=metadata)
-Base.query = db.session.query_property()
+Base.query = db.session.query_property(query_cls=Query)