diff --git a/app/Http/Controllers/PixelfedDirectoryController.php b/app/Http/Controllers/PixelfedDirectoryController.php
index dff65a1ab..ad37541cc 100644
--- a/app/Http/Controllers/PixelfedDirectoryController.php
+++ b/app/Http/Controllers/PixelfedDirectoryController.php
@@ -89,17 +89,14 @@ class PixelfedDirectoryController extends Controller
         $curatedOnboarding = (bool) config_cache('instance.curated_registration.enabled');
         $res['curated_onboarding'] = $curatedOnboarding;
 
-        $oauthEnabled = ConfigCache::whereK('pixelfed.oauth_enabled')->first();
-        if ($oauthEnabled) {
-            $keys = (file_exists(storage_path('oauth-public.key')) || config_cache('passport.public_key')) &&
-                (file_exists(storage_path('oauth-private.key')) || config_cache('passport.private_key'));
-            $res['oauth_enabled'] = (bool) $oauthEnabled && $keys;
-        }
-
-        $activityPubEnabled = ConfigCache::whereK('federation.activitypub.enabled')->first();
-        if ($activityPubEnabled) {
-            $res['activitypub_enabled'] = (bool) $activityPubEnabled;
-        }
+        // Cast the stored config value (not the ConfigCache model, which as an
+        // object always casts to true) so these flags reflect the admin's
+        // settings, matching AdminDirectoryController::buildListing().
+        $res['oauth_enabled'] = (bool) config_cache('pixelfed.oauth_enabled') &&
+            (file_exists(storage_path('oauth-public.key')) || config_cache('passport.public_key')) &&
+            (file_exists(storage_path('oauth-private.key')) || config_cache('passport.private_key'));
+
+        $res['activitypub_enabled'] = (bool) config_cache('federation.activitypub.enabled');
 
         $res['feature_config'] = [
             'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
diff --git a/tests/Feature/Directory/DirectoryListingFeatureFlagsTest.php b/tests/Feature/Directory/DirectoryListingFeatureFlagsTest.php
new file mode 100644
index 000000000..4193e208c
--- /dev/null
+++ b/tests/Feature/Directory/DirectoryListingFeatureFlagsTest.php
@@ -0,0 +1,58 @@
+<?php
+
+use App\Http\Controllers\PixelfedDirectoryController;
+use App\Models\ConfigCache;
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
+
+uses(LazilyRefreshDatabase::class);
+
+/*
+|--------------------------------------------------------------------------
+| Directory listing feature flags
+|--------------------------------------------------------------------------
+|
+| buildListing() must report oauth_enabled / activitypub_enabled from the
+| stored config VALUE. Casting the ConfigCache model to bool always yields
+| true, forcing both flags on even when the admin disabled them.
+|
+*/
+
+/**
+ * Persist a config_cache row so the (pre-fix) model lookup finds a row,
+ * reproducing the production condition where config_cache auto-creates rows.
+ */
+function setConfig(string $key, $value): void
+{
+    config([$key => $value]);
+    ConfigCache::updateOrCreate(['k' => $key], ['v' => $value === false ? '' : (string) $value]);
+}
+
+beforeEach(function () {
+    // buildListing() reads a base listing and a summary; provide both so the
+    // method reaches the feature-flag logic under test.
+    config(['pixelfed.directory' => ['summary' => 'Test instance']]);
+    ConfigCache::updateOrCreate(['k' => 'app.short_description'], ['v' => 'Test instance']);
+});
+
+it('reports disabled feature flags as false', function () {
+    setConfig('federation.activitypub.enabled', false);
+    setConfig('pixelfed.oauth_enabled', false);
+
+    $res = (new PixelfedDirectoryController)->buildListing();
+
+    expect($res['activitypub_enabled'])->toBeFalse()
+        ->and($res['oauth_enabled'])->toBeFalse();
+});
+
+it('reports enabled feature flags as true when configured and keys present', function () {
+    setConfig('federation.activitypub.enabled', true);
+    setConfig('pixelfed.oauth_enabled', true);
+    // Satisfy the oauth key presence check without touching the filesystem.
+    config(['passport.public_key' => 'test-public-key']);
+    config(['passport.private_key' => 'test-private-key']);
+
+    $res = (new PixelfedDirectoryController)->buildListing();
+
+    expect($res['activitypub_enabled'])->toBeTrue()
+        ->and($res['oauth_enabled'])->toBeTrue();
+});