diff --git a/sensorhub-core/src/main/java/org/sensorhub/api/datastore/obs/IDataStreamStore.java b/sensorhub-core/src/main/java/org/sensorhub/api/datastore/obs/IDataStreamStore.java
index 210e9583e0..a09dce0607 100644
--- a/sensorhub-core/src/main/java/org/sensorhub/api/datastore/obs/IDataStreamStore.java
+++ b/sensorhub-core/src/main/java/org/sensorhub/api/datastore/obs/IDataStreamStore.java
@@ -106,12 +106,12 @@ public default IDataStreamInfo getLatestVersion(String sysUID, String outputName
     public default Entry<DataStreamKey, IDataStreamInfo> getLatestVersionEntry(String sysUID, String outputName)
     {
         var entryOpt = selectEntries(new DataStreamFilter.Builder()
-            .withSystems()
+                .withSystems()
                 .withUniqueIDs(sysUID)
                 .done()
-            .withOutputNames(outputName)
-            .build())
-        .findFirst();
+                .withOutputNames(outputName)
+                .build())
+                .max(Entry.comparingByKey());
         
         return entryOpt.isPresent() ? entryOpt.get() : null;
     }