diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
index 11141be4..e33518cb 100644
--- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
+++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
@@ -46,6 +46,8 @@ public class RemoteObjectServiceClient {
     ProtoSerializer<OpP, Op> opProtoSerializer;
     @Inject
     ProtoSerializer<GetObjectReply, ReceivedObject> receivedObjectProtoSerializer;
+    @Inject
+    PeerManager peerManager;
 
     public Pair<PeerId, ReceivedObject> getSpecificObject(JObjectKey key, PeerId peerId) {
         return rpcClientFactory.withObjSyncClient(peerId, (peer, client) -> {
@@ -63,7 +65,9 @@ public class RemoteObjectServiceClient {
         }
 
         var targetVersion = objMeta.versionSum();
-        var targets = objMeta.knownRemoteVersions().entrySet().stream()
+        var targets = objMeta.knownRemoteVersions().isEmpty()
+                ? peerManager.getAvailableHosts()
+                : objMeta.knownRemoteVersions().entrySet().stream()
                 .filter(entry -> entry.getValue().equals(targetVersion))
                 .map(Map.Entry::getKey).toList();