diff --git a/src/storage.h b/src/storage.h
index 01ad490771121cd41925fa73bc8463424643f107..ef4e2f048c93d58ae7236248285437d4a587061f 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -62,7 +62,7 @@ public:
         insert(id, value, expiration);
     }
     size_t size() const { return totalSize_; }
-    std::pair<InfoHash, Value::Id> getOldest() const { return storedValues_.begin()->second; }
+    std::pair<InfoHash, Value::Id> getOldest() const { return storedValues_.empty() ? std::pair<InfoHash, Value::Id>{} : storedValues_.begin()->second; }
 private:
     std::multimap<time_point, std::pair<InfoHash, Value::Id>> storedValues_;
     size_t totalSize_ {0};