diff --git a/handlerutil/handlerutil.go b/handlerutil/handlerutil.go
index 80b929e..4116dc7 100644
--- a/handlerutil/handlerutil.go
+++ b/handlerutil/handlerutil.go
@@ -69,21 +69,20 @@ func Message(message string) http.Handler {
 }
 
 func BaseURL(r *http.Request) string {
-	fallbackProtocoll := "http"
+	var fallbackScheme = "http"
 	if r.TLS != nil {
-		fallbackProtocoll = "https"
+		fallbackScheme = "https"
 	}
-	fallbackHost := "localhost:4747"
 	scheme := first(
 		r.Header.Get("X-Forwarded-Proto"),
 		r.Header.Get("X-Forwarded-Scheme"),
 		r.URL.Scheme,
-		fallbackProtocoll,
+		fallbackScheme,
 	)
 	host := first(
 		r.Header.Get("X-Forwarded-Host"),
+		r.URL.Host,
 		r.Host,
-		fallbackHost,
 	)
 	return fmt.Sprintf("%s://%s", scheme, host)
 }