diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index f4cc75fd921cf9c685560f3214efb17e9517a3d8..24e986c6e71edda31ae1c8b3de6668d3f48a01e2 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -438,15 +438,6 @@
 		RewriteCond %{REQUEST_URI} ^/\.well-known/acme-challenge/
 		RewriteRule ^ - [END]
 </tmpl_if>
-<tmpl_if name='ssl_enabled'>
-<tmpl_else>
-<tmpl_if name='rewrite_to_https' op='==' value='y'>
-		RewriteCond %{HTTPS} off
-		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-</tmpl_if>
-		RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
-</tmpl_if>
-</tmpl_if>
 <tmpl_if name='seo_redirect_enabled'>
 		RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
 		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
@@ -461,6 +452,16 @@
 		</tmpl_if>
 		RewriteRule ^ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>%{REQUEST_URI} [R=301,NE,L]
 </tmpl_loop>
+<tmpl_if name='ssl_enabled'>
+<tmpl_else>
+<tmpl_if name='rewrite_to_https' op='==' value='y'>
+		RewriteCond %{HTTPS} off
+		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
+		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+		</tmpl_if>
+		RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+</tmpl_if>
+</tmpl_if>
 <tmpl_loop name="redirects">
 		RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
 		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
@@ -472,7 +473,6 @@
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>
 		RewriteRule /(.*) <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
-	
 </tmpl_loop>
 </tmpl_if>