diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 0b4e215..d5231be 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -616,7 +616,7 @@
 
             if (isDeviceRemoved(deviceId, portDescriptions.timestamp())) {
                 log.debug("Ignoring outdated events: {}", portDescriptions);
-                return null;
+                return Collections.emptyList();
             }
 
             DeviceDescriptions descs = descsMap.get(providerId);