diff --git a/matrix/server.py b/matrix/server.py
index d4de366..7015974 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -1062,7 +1062,8 @@ class MatrixServer(object):
                 )
             except OlmTrustError as e:
                 m = ("Untrusted devices found in room: {}".format(e))
-                self.error(m)
+                room_buffer = self.find_room_from_id(response.room_id)
+                room_buffer.error(m)
                 return
 
             self.send(request)