diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index fb7681a..0185113 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -109,9 +109,9 @@ def monitoring(metadata):
                 'vars.notification.sms': True,
             }
 
-        if vconfig.get('check_ssl', False):
+        if vconfig.get('check_ssl', metadata.get('nginx/use_ssl_for_all_connections')):
             services['NGINX VHOST {} CERTIFICATE'.format(vname)] = {
-                'check_command': 'check_vhost_https_cert_at_url',
+                'check_command': 'check_https_cert_at_url',
                 'vars.domain': domain,
                 'vars.notification.mail': True,
             }