diff --git a/assets/config.php b/assets/config.php
index e425b806..1cc9c845 100644
--- a/assets/config.php
+++ b/assets/config.php
@@ -81,11 +81,11 @@ return [
         // Features are classes that provide additional functionality
         // not needed for tenancy to be bootstrapped. They are run
         // regardless of whether tenancy has been initialized.
-        Stancl\Tenancy\Features\TenantConfig::class,
         Stancl\Tenancy\Features\TelescopeTags::class,
         Stancl\Tenancy\Features\TenantRedirect::class,
+        // Stancl\Tenancy\Features\TenantConfig::class,
     ],
-    'storage_to_config_map' => [
+    'storage_to_config_map' => [ // Used by the TenantConfig feature
         // 'paypal_api_key' => 'services.paypal.api_key',
     ],
     'home_url' => '/app',
diff --git a/tests/TenantConfigTest.php b/tests/TenantConfigTest.php
index 42aa6be5..68c2cf4a 100644
--- a/tests/TenantConfigTest.php
+++ b/tests/TenantConfigTest.php
@@ -13,10 +13,13 @@ class TenantConfigTest extends TestCase
     public function config_is_merged_and_removed()
     {
         $this->assertSame(null, config('services.paypal'));
-        config(['tenancy.storage_to_config_map' => [
-            'paypal_api_public' => 'services.paypal.public',
-            'paypal_api_private' => 'services.paypal.private',
-        ]]);
+        config([
+            'tenancy.storage_to_config_map' => [
+                'paypal_api_public' => 'services.paypal.public',
+                'paypal_api_private' => 'services.paypal.private',
+            ],
+            'tenancy.features' => ['Stancl\Tenancy\Features\TenantConfig'],
+        ]);
 
         tenancy()->create('foo.localhost', [
             'paypal_api_public' => 'foo',