diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
index f5056a0b21..0387e059bd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java
@@ -20,8 +20,11 @@ public class GitUtils {
     public static final Duration RETRY_DELAY = Duration.ofSeconds(1);
     public static final Integer MAX_RETRIES = 20;
 
-    public static final Pattern GIT_SSH_URL_PATTERN =
-            Pattern.compile("^(ssh://)?git@(?<host>.+?):/*(?<path>.+?)(\\.git)?$");
+    public static final Pattern URL_PATTERN_WITH_SCHEME =
+            Pattern.compile("^ssh://git@(?<host>.+?)(:(?<port>\\d+))?/+(?<path>.+?)(\\.git)?$");
+
+    public static final Pattern URL_PATTERN_WITHOUT_SCHEME =
+            Pattern.compile("^git@(?<host>.+?):/*(?<path>.+?)(\\.git)?$");
 
     /**
      * Sample repo urls :
@@ -37,7 +40,10 @@ public class GitUtils {
             throw new AppsmithException(AppsmithError.INVALID_PARAMETER, "ssh url");
         }
 
-        final Matcher match = GIT_SSH_URL_PATTERN.matcher(sshUrl);
+        Matcher match = URL_PATTERN_WITH_SCHEME.matcher(sshUrl);
+        if (!match.matches()) {
+            match = URL_PATTERN_WITHOUT_SCHEME.matcher(sshUrl);
+        }
 
         if (!match.matches()) {
             throw new AppsmithException(
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
index d6a5176dfe..0409ec3152 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/GitUtilsTest.java
@@ -30,7 +30,7 @@ public class GitUtilsTest {
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("git@example.in:test/testRepo.git"))
                 .isEqualTo("https://example.in/test/testRepo");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
-                        "ssh://git@example.test.net:user/test/tests/testRepo.git"))
+                        "ssh://git@example.test.net/user/test/tests/testRepo.git"))
                 .isEqualTo("https://example.test.net/user/test/tests/testRepo");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
                         "git@tim.tam.example.com:v3/sladeping/pyhe/SpaceJunk.git"))
@@ -38,10 +38,10 @@ public class GitUtilsTest {
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("git@tim.tam.example.com:v3/sladeping/pyhe/SpaceJunk"))
                 .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
-                        "ssh://git@tim.tam.example.com:v3/sladeping/pyhe/SpaceJunk.git"))
+                        "ssh://git@tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk.git"))
                 .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
-                        "ssh://git@tim.tam.example.com:v3/sladeping/pyhe/SpaceJunk"))
+                        "ssh://git@tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk"))
                 .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("git@127.0.0.1:test/newRepo.git"))
                 .isEqualTo("https://127.0.0.1/test/newRepo");
@@ -49,6 +49,17 @@ public class GitUtilsTest {
                 .isEqualTo("https://localhost/test/newRepo");
         assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl("git@absolute.path.com:/test/newRepo.git"))
                 .isEqualTo("https://absolute.path.com/test/newRepo");
+
+        // Custom SSH port:
+        assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
+                        "ssh://git@example.test.net:1234/user/test/tests/testRepo.git"))
+                .isEqualTo("https://example.test.net/user/test/tests/testRepo");
+        assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
+                        "ssh://git@tim.tam.example.com:5678/v3/sladeping/pyhe/SpaceJunk.git"))
+                .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
+        assertThat(GitUtils.convertSshUrlToBrowserSupportedUrl(
+                        "ssh://git@tim.tam.example.com:9876/v3/sladeping/pyhe/SpaceJunk"))
+                .isEqualTo("https://tim.tam.example.com/v3/sladeping/pyhe/SpaceJunk");
     }
 
     @Test
@@ -60,7 +71,7 @@ public class GitUtilsTest {
                 .verifyComplete();
 
         StepVerifier.create(GitUtils.isRepoPrivate(GitUtils.convertSshUrlToBrowserSupportedUrl(
-                        "ssh://git@example.test.net:user/test/tests/testRepo.git")))
+                        "ssh://git@example.test.net/user/test/tests/testRepo.git")))
                 .assertNext(isRepoPrivate -> assertThat(isRepoPrivate).isEqualTo(Boolean.TRUE))
                 .verifyComplete();