diff --git a/src/storage/property_value_store.hpp b/src/storage/property_value_store.hpp
index 4b68d78a3..18ebbfe42 100644
--- a/src/storage/property_value_store.hpp
+++ b/src/storage/property_value_store.hpp
@@ -27,7 +27,7 @@ class PropertyValueStore {
    * @param key The key for which a PropertyValue is sought.
    * @return  See above.
    */
-  const PropertyValue &at(const Property &key) const {
+  PropertyValue at(const Property &key) const {
     for (const auto &kv : props_)
       if (kv.first == key) return kv.second;
 
diff --git a/src/storage/record_accessor.cpp b/src/storage/record_accessor.cpp
index e5b826a5f..5e1d90416 100644
--- a/src/storage/record_accessor.cpp
+++ b/src/storage/record_accessor.cpp
@@ -20,7 +20,7 @@ RecordAccessor<TRecord>::RecordAccessor(AddressT address,
 }
 
 template <typename TRecord>
-const PropertyValue &RecordAccessor<TRecord>::PropsAt(
+PropertyValue RecordAccessor<TRecord>::PropsAt(
     storage::Property key) const {
   return current().properties_.at(key);
 }
diff --git a/src/storage/record_accessor.hpp b/src/storage/record_accessor.hpp
index 39689bbc4..5b298ab16 100644
--- a/src/storage/record_accessor.hpp
+++ b/src/storage/record_accessor.hpp
@@ -55,7 +55,7 @@ class RecordAccessor : public TotalOrdering<RecordAccessor<TRecord>> {
   RecordAccessor &operator=(RecordAccessor &&other) = default;
 
   /** Gets the property for the given key. */
-  const PropertyValue &PropsAt(storage::Property key) const;
+  PropertyValue PropsAt(storage::Property key) const;
 
   /** Sets a value on the record for the given property. */
   void PropsSet(storage::Property key, PropertyValue value);