diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
index 0f48313..f0ad2b0 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
@@ -290,9 +290,10 @@
         TunnelSubscription order = new TunnelSubscription(appId, null, null, tunnelId, null, null,
                                 annotations);
         Tunnel result = tunnelIdAsKeyStore.get(tunnelId);
-        if (result != null || Tunnel.State.INACTIVE.equals(result.state())) {
+        if (result == null || Tunnel.State.INACTIVE.equals(result.state())) {
             return null;
         }
+
         orderSet.add(order);
         orderRelationship.put(appId, orderSet);
         return result;