diff --git a/views/default.handlebars b/views/default.handlebars
index 060d4395..b7e2b97c 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -6457,7 +6457,7 @@
                 }
 
                 // SSH link
-                if ((((connectivity & 1) != 0) || (node.mtype == 3)) && (node.agent) && ((meshrights & 8) != 0) && ((features & 0x40000000) == 0) && (node.agent.id != 14)) {
+                if ((features2 & 0x200) && (((connectivity & 1) != 0) || (node.mtype == 3)) && (node.agent) && ((meshrights & 8) != 0) && ((features & 0x40000000) == 0) && (node.agent.id != 14)) {
                     x += '<a href=# id=sshLink onclick=p10ssh("' + node._id + '") title="' + "Launch web-based SSH session to this device" + '.">' + "Web-SSH" + '</a>&nbsp;';
                 }
 
diff --git a/webserver.js b/webserver.js
index c54f84a2..f874fe3f 100644
--- a/webserver.js
+++ b/webserver.js
@@ -2623,6 +2623,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                 if (((typeof domain.passwordrequirements != 'object') || (domain.passwordrequirements.push2factor != false)) && (obj.parent.firebase != null)) { features2 += 0x00000040; } // Indicates device push notification 2FA is enabled
                 if ((typeof domain.passwordrequirements != 'object') || (domain.passwordrequirements.logintokens != false)) { features2 += 0x00000080; } // Indicates login tokens are allowed
                 if (req.session.loginToken != null) { features2 += 0x00000100; } // LoginToken mode, no account changes.
+                if (domain.ssh == true) { features2 += 0x00000200; } // SSH is enabled
 
                 // Create a authentication cookie
                 const authCookie = obj.parent.encodeCookie({ userid: dbGetFunc.user._id, domainid: domain.id, ip: req.clientIp }, obj.parent.loginCookieEncryptionKey);