diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
index e55d787ed0..57a8dad2d6 100644
--- a/libraries/classes/ConfigStorage/Relation.php
+++ b/libraries/classes/ConfigStorage/Relation.php
@@ -1626,6 +1626,11 @@ class Relation
         $createQueries = null;
         $foundOne = false;
         foreach ($tablesToFeatures as $table => $feature) {
+            if (($GLOBALS['cfg']['Server'][$feature] ?? null) === false) {
+                // The feature is disabled by the user in config
+                continue;
+            }
+
             // Check if the table already exists
             // use the possible replaced name first and fallback on the table name
             // if no replacement exists