diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index 5597e189..d18b2015 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -60,6 +60,7 @@ server {
 
   ## See app/controllers/application_controller.rb for headers set
   add_header X-Accel-Buffering {{NGINX_ACCEL_BUFFERING}};
+  add_header Strict-Transport-Security "max-age={{NGINX_HSTS_MAXAGE}};";
 
   ## Individual nginx logs for this GitLab vhost
   access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log;
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 30af29bf..31b9137d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -712,6 +712,8 @@ nginx_configure_gitlab_hsts() {
       sed -i "/{{NGINX_HSTS_MAXAGE}}/d" ${GITLAB_NGINX_CONFIG}
     fi
     update_template ${GITLAB_NGINX_CONFIG} NGINX_HSTS_MAXAGE
+  else
+    sed -i "/{{NGINX_HSTS_MAXAGE}}/d" ${GITLAB_NGINX_CONFIG}
   fi
 }