diff --git a/core/api/src/main/java/org/onosproject/net/OchPort.java b/core/api/src/main/java/org/onosproject/net/OchPort.java
index eb956f2..94d4d32 100644
--- a/core/api/src/main/java/org/onosproject/net/OchPort.java
+++ b/core/api/src/main/java/org/onosproject/net/OchPort.java
@@ -87,7 +87,9 @@
         if (this == obj) {
             return true;
         }
-        if (obj instanceof OchPort) {
+
+        // Subclass is considered as a change of identity, hence equals() will return false if class type don't match
+        if (obj != null && getClass() == obj.getClass()) {
             final OchPort other = (OchPort) obj;
             return Objects.equals(this.element().id(), other.element().id()) &&
                     Objects.equals(this.number(), other.number()) &&