diff --git a/src/storage/v2/property_store.cpp b/src/storage/v2/property_store.cpp
index 9ca5dfa24..4c08327af 100644
--- a/src/storage/v2/property_store.cpp
+++ b/src/storage/v2/property_store.cpp
@@ -390,6 +390,7 @@ std::optional<std::pair<Type, Size>> EncodePropertyValue(
     }
     case PropertyValue::Type::Double: {
       auto size = writer->WriteDouble(value.ValueDouble());
+      if (!size) return std::nullopt;
       return {{Type::DOUBLE, *size}};
     }
     case PropertyValue::Type::String: {