diff --git a/api.go b/api.go
index fb54f3cf..ddabd937 100644
--- a/api.go
+++ b/api.go
@@ -135,10 +135,10 @@ func (h *Headscale) RegistrationHandler(c *gin.Context) {
 			Msg("Not registered and not NodeKey rotation. Sending a authurl to register")
 
 		if h.cfg.OIDCIssuer != "" {
-			resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", h.cfg.ServerURL, mKey.HexString())
+			resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
 		} else {
 			resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
-				h.cfg.ServerURL, mKey.HexString())
+				strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
 		}
 		respBody, err := encode(resp, &mKey, h.privateKey)
 		if err != nil {
@@ -205,10 +205,10 @@ func (h *Headscale) RegistrationHandler(c *gin.Context) {
 		Str("machine", m.Name).
 		Msg("The node is sending us a new NodeKey, sending auth url")
 	if h.cfg.OIDCIssuer != "" {
-		resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", h.cfg.ServerURL, mKey.HexString())
+		resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
 	} else {
 		resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
-			h.cfg.ServerURL, mKey.HexString())
+			strings.TrimSuffix(h.cfg.ServerURL, "/"), mKey.HexString())
 	}
 	respBody, err := encode(resp, &mKey, h.privateKey)
 	if err != nil {
diff --git a/oidc.go b/oidc.go
index aa80911b..328731ec 100644
--- a/oidc.go
+++ b/oidc.go
@@ -53,7 +53,7 @@ func (h *Headscale) RegisterOIDC(c *gin.Context) {
 			ClientID:     h.cfg.OIDCClientID,
 			ClientSecret: h.cfg.OIDCClientSecret,
 			Endpoint:     oidcProvider.Endpoint(),
-			RedirectURL:  fmt.Sprintf("%s/oidc/callback", h.cfg.ServerURL),
+			RedirectURL:  fmt.Sprintf("%s/oidc/callback", strings.TrimSuffix(h.cfg.ServerURL, "/")),
 			Scopes:       []string{oidc.ScopeOpenID, "profile", "email"},
 		}