diff --git a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
index 11d64b0be4..dc2bac8947 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
@@ -490,15 +490,20 @@ public class EntitiesVersionControlController extends BaseController {
             List<BranchInfo> infos = new ArrayList<>();
 
             String defaultBranch = versionControlService.getVersionControlSettings(tenantId).getDefaultBranch();
-            if (StringUtils.isNotEmpty(defaultBranch)) {
-                infos.add(new BranchInfo(defaultBranch, true));
+            if (StringUtils.isEmpty(defaultBranch)) {
+                if (remoteBranches.contains("main")) {
+                    defaultBranch = "main";
+                } else {
+                    defaultBranch = "master";
+                }
             }
+            infos.add(new BranchInfo(defaultBranch, true));
 
-            remoteBranches.forEach(branch -> {
+            for (String branch : remoteBranches) {
                 if (!branch.equals(defaultBranch)) {
                     infos.add(new BranchInfo(branch, false));
                 }
-            });
+            }
             return infos;
         }, MoreExecutors.directExecutor()));
     }