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