diff --git a/neon_hana/app/routers/assist.py b/neon_hana/app/routers/assist.py
index 1ca560d..52d88f0 100644
--- a/neon_hana/app/routers/assist.py
+++ b/neon_hana/app/routers/assist.py
@@ -46,5 +46,6 @@ async def get_tts(request: TTSRequest) -> TTSResponse:
 @assist_route.post("/get_response")
 async def get_response(skill_request: SkillRequest,
                        request: Request) -> SkillResponse:
-    skill_request.node_data.networking.public_ip = request.client.host
+    if not skill_request.node_data.networking.public_ip:
+        skill_request.node_data.networking.public_ip = request.client.host
     return mq_connector.get_response(**dict(skill_request))