diff --git a/src/uagents/asgi.py b/src/uagents/asgi.py
index 0b3956e7..b60b0107 100644
--- a/src/uagents/asgi.py
+++ b/src/uagents/asgi.py
@@ -11,8 +11,8 @@
 from uagents.crypto import is_user_address
 from uagents.dispatch import dispatcher
 from uagents.envelope import Envelope
-from uagents.models import Model, ErrorMessage
-from uagents.query import enclose_response
+from uagents.models import ErrorMessage
+from uagents.query import enclose_response_raw
 
 
 HOST = "0.0.0.0"
@@ -163,12 +163,14 @@ async def __call__(self, scope, receive, send):
 
         # wait for any queries to be resolved
         if expects_response:
-            response_msg: Model = await self._queries[env.sender]
+            response_msg, schema_digest = await self._queries[env.sender]
             if env.expires is not None:
                 if datetime.now() > datetime.fromtimestamp(env.expires):
                     response_msg = ErrorMessage(error="Query envelope expired")
             sender = env.target
-            response = enclose_response(response_msg, sender, str(env.session))
+            response = enclose_response_raw(
+                response_msg, schema_digest, sender, str(env.session)
+            )
         else:
             response = "{}"
 
diff --git a/src/uagents/context.py b/src/uagents/context.py
index a0e9b44b..f1970084 100644
--- a/src/uagents/context.py
+++ b/src/uagents/context.py
@@ -12,7 +12,7 @@
 
 from uagents.config import DEFAULT_ENVELOPE_TIMEOUT_SECONDS
 from uagents.crypto import Identity
-from uagents.dispatch import dispatcher
+from uagents.dispatch import JsonStr, dispatcher
 from uagents.envelope import Envelope
 from uagents.models import Model, ErrorMessage
 from uagents.resolver import Resolver
@@ -103,10 +103,23 @@ async def send(
         message: Model,
         timeout: Optional[int] = DEFAULT_ENVELOPE_TIMEOUT_SECONDS,
     ):
-        # convert the message into object form
-        json_message = message.json()
         schema_digest = Model.build_schema_digest(message)
+        await self.send_raw(
+            destination,
+            message.json(),
+            schema_digest,
+            message_type=type(message),
+            timeout=timeout,
+        )
 
+    async def send_raw(
+        self,
+        destination: str,
+        json_message: JsonStr,
+        schema_digest: str,
+        message_type: Optional[Type[Model]] = None,
+        timeout: Optional[int] = DEFAULT_ENVELOPE_TIMEOUT_SECONDS,
+    ):
         # check if this message is a reply
         if (
             self._message_received is not None
@@ -118,7 +131,7 @@ async def send(
                 # ensure the reply is valid
                 if schema_digest not in self._replies[received.schema_digest]:
                     self._logger.exception(
-                        f"Outgoing message {type(message)} "
+                        f"Outgoing message {message_type or ''} "
                         f"is not a valid reply to {received.message}"
                     )
                     return
@@ -127,7 +140,7 @@ async def send(
         if self._message_received is None and self._interval_messages:
             if schema_digest not in self._interval_messages:
                 self._logger.exception(
-                    f"Outgoing message {type(message)} is not a valid interval message"
+                    f"Outgoing message {message_type} is not a valid interval message"
                 )
                 return
 
@@ -140,7 +153,7 @@ async def send(
 
         # handle queries waiting for a response
         if destination in self._queries:
-            self._queries[destination].set_result(message)
+            self._queries[destination].set_result((json_message, schema_digest))
             del self._queries[destination]
             return
 
diff --git a/src/uagents/query.py b/src/uagents/query.py
index 678367dc..3db43bb4 100644
--- a/src/uagents/query.py
+++ b/src/uagents/query.py
@@ -6,6 +6,7 @@
 
 from uagents.config import get_logger
 from uagents.crypto import generate_user_address
+from uagents.dispatch import JsonStr
 from uagents.envelope import Envelope
 from uagents.models import Model
 from uagents.resolver import Resolver, AlmanacResolver
@@ -68,12 +69,19 @@ async def query(
 
 
 def enclose_response(message: Model, sender: str, session: str) -> str:
+    schema_digest = Model.build_schema_digest(message)
+    return enclose_response_raw(message.json(), schema_digest, sender, session)
+
+
+def enclose_response_raw(
+    json_message: JsonStr, schema_digest: str, sender: str, session: str
+) -> str:
     response_env = Envelope(
         version=1,
         sender=sender,
         target="",
         session=session,
-        schema_digest=Model.build_schema_digest(message),
+        schema_digest=schema_digest,
     )
-    response_env.encode_payload(message.json())
+    response_env.encode_payload(json_message)
     return response_env.json()
diff --git a/tests/test_server.py b/tests/test_server.py
index f95356f1..c904e7e1 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -23,7 +23,9 @@ def setUp(self) -> None:
     async def mock_process_sync_message(self, sender: str, msg: Model):
         while True:
             if sender in self.agent._server._queries:
-                self.agent._server._queries[sender].set_result(msg)
+                self.agent._server._queries[sender].set_result(
+                    (msg.json(), Model.build_schema_digest(msg))
+                )
                 return
 
     async def test_message_success(self):