diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
index 36a1b23943..484c158574 100644
--- a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
+++ b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
@@ -589,8 +589,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
             // First get the last update state and time
             currentValue = db.getLastDatasourceValue(DATASOURCE_STATE);
             lastUpdate = db.getLastArchiveUpdateTime();
-            if (currentValue == Double.NaN) {
-                logger.debug("Could not find persisted value for item '{}' in rrjd4j database", itemName);
+            if (Double.isNaN(currentValue)) {
+                logger.debug("Could not find persisted value for item '{}' in rrd4j database", itemName);
                 return null;
             }