diff --git a/http.go b/http.go
index 9ef0499c..b7ee9598 100644
--- a/http.go
+++ b/http.go
@@ -155,7 +155,8 @@ func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
 
 func redirectToHTTPS(opts *Options, h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if opts.ForceHTTPS && r.TLS == nil {
+		proto := r.Header.Get("X-Forwarded-Proto")
+		if opts.ForceHTTPS && r.TLS == nil && strings.ToLower(proto) != "https" {
 			http.Redirect(w, r, opts.HTTPSAddress, http.StatusPermanentRedirect)
 		}