diff --git a/browser/js/global.js b/browser/js/global.js
index f33f28083..c76ce483c 100644
--- a/browser/js/global.js
+++ b/browser/js/global.js
@@ -1306,7 +1306,7 @@ window.app = {
 				if (L.Browser.cypressTest && isCalcTest)
 					global.enableAccessibility = false;
 
-				var accessibilityState = global.prefs.getBoolean('accessibilityState', false);
+				var accessibilityState = global.prefs.getBoolean('accessibilityState');
 				accessibilityState = accessibilityState || (L.Browser.cypressTest && !isCalcTest);
 				msg += ' accessibilityState=' + accessibilityState;
 
diff --git a/browser/src/core/Socket.js b/browser/src/core/Socket.js
index f16d4acfa..14ef4cb55 100644
--- a/browser/src/core/Socket.js
+++ b/browser/src/core/Socket.js
@@ -250,8 +250,17 @@ app.definitions.Socket = L.Class.extend({
 		const darkTheme = window.prefs.getBoolean('darkTheme');
 		msg += ' darkTheme=' + darkTheme;
 
+		var isCalcTest =
+			window.docURL.includes('data/desktop/calc/') ||
+			window.docURL.includes('data/mobile/calc/') ||
+			window.docURL.includes('data/idle/calc/') ||
+			window.docURL.includes('data/multiuser/calc/');
+
+		if (L.Browser.cypressTest && isCalcTest)
+			window.enableAccessibility = false;
+
 		var accessibilityState = window.prefs.getBoolean('accessibilityState');
-		accessibilityState = accessibilityState || L.Browser.cypressTest;
+		accessibilityState = accessibilityState || (L.Browser.cypressTest && !isCalcTest);
 		msg += ' accessibilityState=' + accessibilityState;
 
 		this._doSend(msg);