diff --git a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java
index a448fb0b892..e523e7b3059 100644
--- a/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java
+++ b/modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java
@@ -831,7 +831,7 @@ public String toString() {
 
     @Nonnull
     private <T> Optional<T> toOptional(FileAttribute attribute, T value) {
-        return isDefined(attribute) ? Optional.of(value) : Optional.empty();
+        return isDefined(attribute) ? Optional.ofNullable(value) : Optional.empty();
     }
 
     private void readObject(ObjectInputStream stream)