diff --git a/src/server/routes/agent/agent.routes.ts b/src/server/routes/agent/agent.routes.ts
index be3681b7..a445ae70 100644
--- a/src/server/routes/agent/agent.routes.ts
+++ b/src/server/routes/agent/agent.routes.ts
@@ -131,6 +131,7 @@ export default async function agentRoutes(
       const agentRepository = fastify.db.agentRepository;
       const relations = [
         "address.postcode",
+        "agentPostcode.postcode",
         "district",
         "opportunity.opportunityVolunteer",
         "organization.address.postcode",
diff --git a/src/services/dto/dto-agent.ts b/src/services/dto/dto-agent.ts
index 18b1d5a9..470aada5 100644
--- a/src/services/dto/dto-agent.ts
+++ b/src/services/dto/dto-agent.ts
@@ -81,9 +81,14 @@ export function dtoOpportunityAgent(agent: Agent): ApiOpportunityAgent {
 }
 
 function dtoAgentDetails(agent: Agent): AgentDetails {
+  let address = serializeAddress(agent.address);
+  if (!agent.address && agent.agentPostcode?.length) {
+    const plz = agent.agentPostcode[0].postcode?.value;
+    if (plz) address = `${plz} Berlin`;
+  }
   return {
     about: agent.info,
-    address: serializeAddress(agent.address),
+    address,
     website: agent.website,
     organizationType: agent.type,
     operator: agent?.organization?.title,