diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 1ab6e65ae7d..c98a704897d 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -21,6 +21,9 @@ public function isRichEditingEnabled(): bool {
 	}
 
 	public function isRichWorkspaceAvailable(): bool {
+		if ($this->config->getSystemValueBool('enable_non-accessible_features', true) === false) {
+			return false;
+		}
 		return $this->config->getAppValue(Application::APP_NAME, 'workspace_available', '1') === '1';
 	}