diff --git a/plugins/nginx-vhosts/templates/ssl.server.config b/plugins/nginx-vhosts/templates/ssl.server.config
index 490a13bb1..7c19885e3 100644
--- a/plugins/nginx-vhosts/templates/ssl.server.config
+++ b/plugins/nginx-vhosts/templates/ssl.server.config
@@ -2,6 +2,7 @@ server {
   listen      [::]:{{ .NGINX_SSL_PORT }} ssl spdy;
   listen      {{ .NGINX_SSL_PORT }} ssl spdy;
   {{ if .SSL_SERVER_NAME }}server_name {{ .SSL_SERVER_NAME }}; {{ end }}
+  {{ if .NOSSL_SERVER_NAME }}server_name {{ .NOSSL_SERVER_NAME }}; {{ end }}
 {{ include "log.config" . }}
   ssl_certificate     {{ .APP_SSL_PATH }}/server.crt;
   ssl_certificate_key {{ .APP_SSL_PATH }}/server.key;
diff --git a/tests/unit/40_nginx-vhosts_2.bats b/tests/unit/40_nginx-vhosts_2.bats
index ad5e48948..902e253fa 100644
--- a/tests/unit/40_nginx-vhosts_2.bats
+++ b/tests/unit/40_nginx-vhosts_2.bats
@@ -41,6 +41,15 @@ assert_error_log() {
   assert_error_log ${TEST_APP}
 }
 
+@test "(nginx-vhosts) nginx:build-config (with SSL & unrelated domain)" {
+  setup_test_tls
+  add_domain "node-js-app.dokku.me"
+  add_domain "test.dokku.me"
+  deploy_app
+  assert_ssl_domain "node-js-app.dokku.me"
+  assert_http_redirect "http://test.dokku.me" "https://test.dokku.me:443/"
+}
+
 @test "(nginx-vhosts) nginx:build-config (wildcard SSL)" {
   setup_test_tls wildcard
   add_domain "wildcard1.dokku.me"