diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
index 1aa8bb9..4672d81 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
@@ -59,7 +59,13 @@
 
     @Override
     public DiscreteResources difference(DiscreteResources other) {
-        return of(Sets.difference(this.values(), other.values()));
+        if (other instanceof GenericDiscreteResources) {
+            return of(Sets.difference(this.values(), other.values()));
+        } else if (other instanceof EmptyDiscreteResources) {
+            return this;
+        }
+
+        return DiscreteResources.of(Sets.difference(this.values(), other.values()));
     }
 
     @Override