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 ea7ebd3..c4fe0a8 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
@@ -485,17 +485,15 @@
             // accept off-line if given timestamp is newer than
             // the latest Timestamp from Primary provider
             DeviceDescriptions primDescs = getPrimaryDescriptions(providerDescs);
-            if (primDescs == null) {
-                return null;
-            }
-
-            Timestamp lastTimestamp = primDescs.getLatestTimestamp();
-            if (lastTimestamp == null) {
-                lastTimestamp = deviceClockService.getTimestamp(deviceId);
-            }
-            if (timestamp.compareTo(lastTimestamp) <= 0) {
-                // outdated event ignore
-                return null;
+            if (primDescs != null) {
+                Timestamp lastTimestamp = primDescs.getLatestTimestamp();
+                if (lastTimestamp == null) {
+                    lastTimestamp = deviceClockService.getTimestamp(deviceId);
+                }
+                if (timestamp.compareTo(lastTimestamp) <= 0) {
+                    // outdated event ignore
+                    return null;
+                }
             }
 
             offline.put(deviceId, timestamp);
@@ -1453,8 +1451,7 @@
 
                 // checking if remote timestamp is more recent.
                 Timestamp rOffline = offlineAds.get(deviceId);
-                if (rOffline != null &&
-                        rOffline.compareTo(localLatest) > 0) {
+                if (localLatest == null || (rOffline != null && rOffline.compareTo(localLatest) > 0)) {
                     // remote offline timestamp suggests that the
                     // device is off-line
                     markOfflineInternal(deviceId, rOffline);