diff --git a/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
index 06ab3735..ae132a96 100644
--- a/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
+++ b/Docker/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
@@ -140,7 +140,10 @@ Methods:
       - applicationName:
           Contract: $.string().notNull()
     Body:
-      - Return: $.kubernetesCluster.serviceEndpoints.where($.applicationName = $applicationName)
+      - Return: $.kubernetesCluster.serviceEndpoints.where(
+            $.applicationName = $applicationName
+            and $.podId = $this._getPodName()
+         )
 
 
   _getPortDefinition: