diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
index 1d4e63bd305836eff56c0933bbc67d2c6fd3bb7d..74f8560f07d6bfe98268902e5cffdabc17cc1ff8 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
@@ -22,13 +22,12 @@
 */
 package net.jami.jams.server.servlets.api.jaminameserver;
 
-import com.jsoniter.output.JsonStream;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import net.jami.jams.common.jami.AddrLookupResponse;
+import net.jami.jams.common.annotations.JsonContent;
 import net.jami.jams.common.serialization.tomcat.TomcatCustomErrorHandler;
 
 import java.io.IOException;
@@ -54,10 +53,11 @@ public class AddressServlet extends HttpServlet {
      * @apiError (500) {null} null could not fetch user information
      */
     @Override
+    @JsonContent
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         String[] path = req.getPathInfo().split("/");
         String username = nameServer.getNameFromAddress(path[path.length - 1]);
-        if (username == null) TomcatCustomErrorHandler.sendCustomError(resp,404,"address not found");
-        else resp.getOutputStream().write(JsonStream.serialize(new AddrLookupResponse(username)).getBytes());
+        if (username == null) TomcatCustomErrorHandler.sendCustomError(resp,404,"Address not found!");
+        else resp.getWriter().write(username);
     }
 }