diff --git a/core/viewsets.py b/core/viewsets.py
index fb7221ea..922094b2 100644
--- a/core/viewsets.py
+++ b/core/viewsets.py
@@ -552,14 +552,22 @@ class AddressViewSet(EvibesViewSet):
         return AddressSerializer
 
     def create(self, request, **kwargs):
-        serializer = AddressCreateSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
+        create_serializer = AddressCreateSerializer(
+            data=request.data,
+            context={"request": request}
+        )
+        create_serializer.is_valid(raise_exception=True)
 
-        serializer = AddressSerializer(serializer.create(serializer.validated_data))
+        address_obj = create_serializer.create(create_serializer.validated_data)
+
+        output_serializer = AddressSerializer(
+            address_obj,
+            context={"request": request}
+        )
 
         return Response(
             status=status.HTTP_201_CREATED,
-            data=serializer.data,
+            data=output_serializer.data,
         )
 
     @action(detail=False, methods=["get"], url_path="autocomplete")