diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
index 65a9e9f..4f4e570 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
@@ -216,7 +216,8 @@
             if (Strings.isNullOrEmpty(fip.getFloatingIpAddress())) {
                 continue;
             }
-            if (fip.getFixedIpAddress().equals(port.ipAddress().toString())) {
+            if (fip.getFixedIpAddress().equals(port.ipAddress().toString()) &&
+                    fip.getPortId().equals(port.portId())) {
                 return fip;
             }
         }