diff --git a/odata/query.py b/odata/query.py
index c19e8a7..343d793 100644
--- a/odata/query.py
+++ b/odata/query.py
@@ -170,7 +170,7 @@ def _new_query(self) -> "Query[Q]":
         o['$filter'] = self.options.get('$filter', [])[:]
         o['$expand'] = self.options.get('$expand', [])[:]
         o['$orderby'] = self.options.get('$orderby', [])[:]
-        return Query[Q](self.entity, options=o, connection=self.connection)
+        return self.__class__[Q](self.entity, options=o, connection=self.connection)
 
     def as_string(self) -> str:
         query = self._format_params(self._get_options())