diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c
index 2ff7683f71d6dfc7e2808e55805a13b78ff98e9f..5f59026092a2cc8cc3fc62966e9aa0e66cc1ebf9 100644
--- a/src/sbbs3/js_socket.c
+++ b/src/sbbs3/js_socket.c
@@ -1762,6 +1762,8 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict
 								// Reduced compliance checking... required for acme-staging-v02.api.letsencrypt.org
 								do_cryptAttribute(p->session, CRYPT_OPTION_CERT_COMPLIANCELEVEL, CRYPT_COMPLIANCELEVEL_REDUCED);
 								if (tiny == SOCK_PROP_SSL_SESSION) {
+									// TODO: Make this configurable
+									do_cryptAttribute(p->session, CRYPT_SSLOPTION_DISABLE_NAMEVERIFY, 1);
 									ret=do_cryptAttributeString(p->session, CRYPT_SESSINFO_SERVER_NAME, p->hostname, strlen(p->hostname));
 									p->tls_server = FALSE;
 								}