diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
index 33d9ea1e21..6ea8115e53 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
@@ -254,6 +254,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
     @Override
     public UUID loadEntitiesVersion(SecurityUser user, VersionLoadRequest request) throws Exception {
         EntitiesImportCtx ctx = new EntitiesImportCtx(UUID.randomUUID(), user, request.getVersionId());
+        cachePut(ctx.getRequestId(), VersionLoadResult.empty());
         switch (request.getType()) {
             case SINGLE_ENTITY: {
                 SingleEntityVersionLoadRequest versionLoadRequest = (SingleEntityVersionLoadRequest) request;
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
index f5585fac39..99246d282f 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
@@ -378,6 +378,7 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
                 commitResult.setAdded(commitResponse.getAdded());
                 commitResult.setRemoved(commitResponse.getRemoved());
                 commitResult.setModified(commitResponse.getModified());
+                commitResult.setDone(true);
                 ((CommitGitRequest) request).getFuture().set(commitResult);
             } else if (vcResponseMsg.hasListBranchesResponse()) {
                 var listBranchesResponse = vcResponseMsg.getListBranchesResponse();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/VersionLoadResult.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/VersionLoadResult.java
index 3913f6dd8e..05d96f10ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/VersionLoadResult.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/VersionLoadResult.java
@@ -20,6 +20,7 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 
 @Data
@@ -33,6 +34,10 @@ public class VersionLoadResult implements Serializable {
     private EntityLoadError error;
     private boolean done;
 
+    public static VersionLoadResult empty() {
+        return VersionLoadResult.builder().result(Collections.emptyList()).build();
+    }
+
     public static VersionLoadResult success(List<EntityTypeLoadResult> result) {
         return VersionLoadResult.builder().result(result).build();
     }