diff --git a/modules/util/util.go b/modules/util/util.go
index 4bd2b843f7..b6acb9796e 100644
--- a/modules/util/util.go
+++ b/modules/util/util.go
@@ -72,8 +72,8 @@ func URLJoin(base string, elems ...string) string {
 		return ""
 	}
 	joinedURL := baseURL.ResolveReference(argURL).String()
-	if !baseURL.IsAbs() {
-		return joinedURL[1:] // Removing leading '/'
+	if !baseURL.IsAbs() && !strings.HasPrefix(base, "/") {
+		return joinedURL[1:] // Removing leading '/' if needed
 	}
 	return joinedURL
 }
diff --git a/modules/util/util_test.go b/modules/util/util_test.go
index 67d9efe1d2..0d79df6050 100644
--- a/modules/util/util_test.go
+++ b/modules/util/util_test.go
@@ -32,6 +32,12 @@ func TestURLJoin(t *testing.T) {
 			"a/", "b/c/", "/../d/"),
 		newTest("https://try.gitea.io/a/b/c#d",
 			"https://try.gitea.io", "a/b", "c#d"),
+		newTest("/a/b/d",
+			"/a/", "b/c/", "/../d/"),
+		newTest("/a/b/c",
+			"/a", "b/c/"),
+		newTest("/a/b/c#hash",
+			"/a", "b/c#hash"),
 	} {
 		assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
 	}