diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf
index 66b3ed3f2..f47fbfdf9 100644
--- a/salt/nginx/etc/nginx.conf
+++ b/salt/nginx/etc/nginx.conf
@@ -37,13 +37,6 @@ http {
 
 	include /etc/nginx/conf.d/*.conf;
 
-
-	server {
-		listen 80 default_server;
-		server_name _;
-		return 301 https://{{ url_base }}$request_uri;
-	}
-
 	{%- if airgap is sameas true %}
 	server {
 		listen 7788;
@@ -87,6 +80,12 @@ http {
 	{%- endif %}
 
 	{%- if role in ['eval', 'managersearch', 'manager', 'standalone'] %}
+	server {
+		listen 80 default_server;
+		server_name _;
+		return 301 https://{{ url_base }}$request_uri;
+	}
+
 	server {
 		listen 443 ssl http2 default_server;
 		server_name _;