diff --git a/src/Features/TenantConfig.php b/src/Features/TenantConfig.php
new file mode 100644
index 00000000..0829a1e4
--- /dev/null
+++ b/src/Features/TenantConfig.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Features;
+
+use Illuminate\Foundation\Application;
+use Stancl\Tenancy\Contracts\Feature;
+use Stancl\Tenancy\Tenant;
+use Stancl\Tenancy\TenantManager;
+
+class TenantConfig implements Feature
+{
+    /** @var Application */
+    protected $app;
+
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    public function bootstrap(TenantManager $tenantManager): void
+    {
+        $tenantManager->eventListener('bootstrapped', function (TenantManager $manager) {
+            $this->setTenantConfig($manager->getTenant());
+        });
+
+        $tenantManager->eventListener('ended', function () {
+            $this->unsetTenantConfig();
+        });
+    }
+
+    public function setTenantConfig(Tenant $tenant): void
+    {
+        foreach($this->getStorageToConfigMap() as $storageKey => $configKey) {
+            $this->app['config'][$configKey] = $tenant->get($storageKey);
+        }
+    }
+
+    public function getStorageToConfigMap(): array
+    {
+        return $this->app['config']['tenancy.storage_to_config_map'] ?? [];
+    }
+}
\ No newline at end of file