diff --git a/resolvers/__init__.py b/resolvers/__init__.py
index b40ad96..53e685f 100644
--- a/resolvers/__init__.py
+++ b/resolvers/__init__.py
@@ -4,7 +4,6 @@ from .messages import messages_resolvers
 from .search import search_resolvers
 from .unread import unread_resolvers
 import json
-from ariadne import MutationType, QueryType, SubscriptionType
 from ariadne import ScalarType
 
 
@@ -16,11 +15,6 @@ def serialize_datetime(value):
     return value.isoformat()
 
 
-query = QueryType()
-mutation = MutationType()
-subscription = SubscriptionType()
-
-
 dict_scalar = ScalarType("Dict")
 
 
diff --git a/resolvers/chats.py b/resolvers/chats.py
index 7d6914b..727b129 100644
--- a/resolvers/chats.py
+++ b/resolvers/chats.py
@@ -4,7 +4,10 @@ from datetime import datetime, timezone
 
 from services.auth import login_required
 from services.redis import redis
-from resolvers import mutation
+
+from ariadne import MutationType
+
+mutation = MutationType()
 
 
 @mutation.field("updateChat")
diff --git a/resolvers/load.py b/resolvers/load.py
index a7ee138..b99c460 100644
--- a/resolvers/load.py
+++ b/resolvers/load.py
@@ -2,11 +2,14 @@ import json
 
 from services.core import get_author
 from services.redis import redis
-from resolvers import query
 from services.auth import login_required
 from .chats import create_chat
 from .unread import get_unread_counter
 
+from ariadne import QueryType
+
+query = QueryType()
+
 
 # NOTE: not an API handler
 async def load_messages(chat_id: str, limit: int = 5, offset: int = 0, ids=[]):
diff --git a/resolvers/messages.py b/resolvers/messages.py
index 97356d9..ef10fa8 100644
--- a/resolvers/messages.py
+++ b/resolvers/messages.py
@@ -3,7 +3,10 @@ from datetime import datetime, timezone
 from services.auth import login_required
 from services.presence import notify_message
 from services.redis import redis
-from resolvers import mutation
+
+from ariadne import MutationType
+
+mutation = MutationType()
 
 
 @mutation.field("createMessage")
diff --git a/resolvers/search.py b/resolvers/search.py
index ec0676c..05c735d 100644
--- a/resolvers/search.py
+++ b/resolvers/search.py
@@ -3,8 +3,10 @@ from datetime import datetime, timezone, timedelta
 from services.auth import login_required
 from services.core import get_network
 from services.redis import redis
-from resolvers import query
 from resolvers.load import load_messages
+from ariadne import QueryType
+
+query = QueryType()
 
 
 @query.field("searchRecipients")