diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php
index 674fd82ef..73a0bb603 100755
--- a/Blacklight/Releases.php
+++ b/Blacklight/Releases.php
@@ -166,18 +166,16 @@ class Releases extends Release
     /**
      * @return string
      */
-    public function showPasswords(): ?string
+    public function showPasswords()
     {
         $show = (int) Settings::settingValue('..showpasswordedrelease');
-        $setting = $show ?? 1;
+        $setting = $show ?? 0;
         switch ($setting) {
-            case 0: // Hide releases with a password or a potential password (Hide unprocessed releases).
-
-                    return '= '.self::PASSWD_NONE;
-
             case 1: // Shows everything.
-            default:
                     return '<= '.self::PASSWD_RAR;
+            case 0:
+            default:// Hide releases with a password.
+                return '= '.self::PASSWD_NONE;
         }
     }
 
diff --git a/Blacklight/processing/ProcessReleases.php b/Blacklight/processing/ProcessReleases.php
index 80b88a299..ab23964e8 100755
--- a/Blacklight/processing/ProcessReleases.php
+++ b/Blacklight/processing/ProcessReleases.php
@@ -908,7 +908,7 @@ class ProcessReleases
 
         // Passworded releases.
         if ((int) Settings::settingValue('..deletepasswordedrelease') === 1) {
-            $releases = Release::query()->where('passwordstatus', '=', Releases::PASSWD_RAR)->select(['id', 'guid'])->get();
+            $releases = Release::query()->join('release_files', 'release_files.releases_id', '=', 'releases.id')->select(['id', 'guid'])->where('release_files.passworded', '=', Releases::PASSWD_RAR)->orWhere('passwordstatus', '=', Releases::PASSWD_RAR)->get();
             foreach ($releases as $release) {
                 $this->releases->deleteSingle(['g' => $release->guid, 'i' => $release->id], $this->nzb, $this->releaseImage);
                 $passwordDeleted++;
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index e44a5fdfb..7cf912363 100644
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -18,7 +18,8 @@ use App\Http\Controllers\BasePageController;
 class ApiController extends BasePageController
 {
     /**
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Symfony\Component\HttpFoundation\StreamedResponse
      * @throws \Throwable
      */
     public function api(Request $request)
diff --git a/database/fixtures/settings.php b/database/fixtures/settings.php
index bd2574632..a31557514 100644
--- a/database/fixtures/settings.php
+++ b/database/fixtures/settings.php
@@ -725,8 +725,8 @@ return [
         'section' => '',
         'subsection' => '',
         'name' => 'showpasswordedrelease',
-        'value' => '10',
-        'hint' => 'Whether to show passworded or potentially passworded releases in browse, search, api and rss feeds. Potentially passworded means releases which contain .cab or .ace files which are typically password protected. (*yes): Unprocessed releases are hidden. (*no): Unprocessed releases are displayed.',
+        'value' => '0',
+        'hint' => 'Whether to show or hide passworded releases in browse, search, api and rss feeds.',
         'setting' => 'showpasswordedrelease',
     ],
     92 => [
diff --git a/database/seeds/SettingsTableSeeder.php b/database/seeds/SettingsTableSeeder.php
index 05aac4394..5028ecfe0 100644
--- a/database/seeds/SettingsTableSeeder.php
+++ b/database/seeds/SettingsTableSeeder.php
@@ -730,8 +730,8 @@ class SettingsTableSeeder extends Seeder
                 'section' => '',
                 'subsection' => '',
                 'name' => 'showpasswordedrelease',
-                'value' => '10',
-                'hint' => 'Whether to show passworded or potentially passworded releases in browse, search, api and rss feeds. Potentially passworded means releases which contain .cab or .ace files which are typically password protected. (*yes): Unprocessed releases are hidden. (*no): Unprocessed releases are displayed.',
+                'value' => '0',
+                'hint' => 'Whether to show or hide passworded releases in browse, search, api and rss feeds.',
                 'setting' => 'showpasswordedrelease',
             ],
             92 => [