diff --git a/server/handler/handler_sub_domain.go b/server/handler/handler_sub_domain.go
index e7cb3a6..6c14393 100644
--- a/server/handler/handler_sub_domain.go
+++ b/server/handler/handler_sub_domain.go
@@ -57,7 +57,7 @@ func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gite
 		} else {
 			html.ReturnErrorPage(
 				ctx,
-				formatSetBranchNotFoundMessage(targetOpt.TargetBranch, targetOpt.TargetOwner, targetOpt.TargetRepo),
+				formatSetBranchNotFoundMessage(pathElements[1][1:], targetOwner, pathElements[0]),
 				http.StatusFailedDependency,
 			)
 		}
@@ -89,7 +89,7 @@ func handleSubDomain(log zerolog.Logger, ctx *context.Context, giteaClient *gite
 		} else {
 			html.ReturnErrorPage(
 				ctx,
-				formatSetBranchNotFoundMessage(targetOpt.TargetBranch, targetOpt.TargetOwner, targetOpt.TargetRepo),
+				formatSetBranchNotFoundMessage(targetBranch, targetOwner, defaultPagesRepo),
 				http.StatusFailedDependency,
 			)
 		}