diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectMetaData.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectMetaData.java
index 6c74e97d..6924b360 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectMetaData.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectMetaData.java
@@ -32,8 +32,8 @@ public class ObjectMetaData implements Serializable {
     }
 
     public Long getBestVersion() {
-        if (_remoteCopies.isEmpty()) return 0L;
-        return _remoteCopies.values().stream().max(Long::compareTo).get();
+        if (_remoteCopies.isEmpty()) return getOurVersion();
+        return Math.max(getOurVersion(), _remoteCopies.values().stream().max(Long::compareTo).get());
     }
 
     public ObjectChangelog toRpcChangelog() {