diff --git a/public/index.php b/public/index.php
index 66f883733..9f17fe3df 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,8 +2,6 @@
 
 require_once __DIR__.DIRECTORY_SEPARATOR.'smarty.php';
 
-use App\Models\User;
-use App\Models\Settings;
 
 $page = new Page;
 
@@ -67,12 +65,6 @@ switch ($page->page) {
     case 'upcoming':
     case 'xxx':
     case 'xxxmodal':
-        // Don't show these pages if it's an API-only site.
-        if (! User::isLoggedIn() && (int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_API_ONLY) {
-            header('Location: '.Settings::settingValue('site.main.code'));
-            break;
-        }
-        // no break
     case 'api':
     case 'failed':
     case 'getnzb':
diff --git a/public/pages/failed.php b/public/pages/failed.php
index 8678bd956..0ff3e8ff2 100644
--- a/public/pages/failed.php
+++ b/public/pages/failed.php
@@ -1,7 +1,6 @@
 <?php
 
 use App\Models\User;
-use App\Models\Settings;
 use nntmux\DnzbFailures;
 
 // Page is accessible only by the rss token, or logged in users.
@@ -9,22 +8,12 @@ if (User::isLoggedIn()) {
     $uid = User::currentUserId();
     $rssToken = $page->userdata['rsstoken'];
 } else {
-    if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_API_ONLY) {
-        if (! isset($_GET['rsstoken'])) {
-            header('X-DNZB-RCode: 400');
-            header('X-DNZB-RText: Bad request, please supply all parameters!');
-            $page->show403();
-        } else {
-            $res = User::getByRssToken($_GET['rsstoken']);
-        }
+    if (! isset($_GET['userid']) || ! isset($_GET['rsstoken'])) {
+        header('X-DNZB-RCode: 400');
+        header('X-DNZB-RText: Bad request, please supply all parameters!');
+        $page->show403();
     } else {
-        if (! isset($_GET['userid']) || ! isset($_GET['rsstoken'])) {
-            header('X-DNZB-RCode: 400');
-            header('X-DNZB-RText: Bad request, please supply all parameters!');
-            $page->show403();
-        } else {
-            $res = User::getByIdAndRssToken($_GET['userid'], $_GET['rsstoken']);
-        }
+        $res = User::getByIdAndRssToken($_GET['userid'], $_GET['rsstoken']);
     }
     if (! isset($res)) {
         header('X-DNZB-RCode: 401');
diff --git a/public/pages/getnzb.php b/public/pages/getnzb.php
index a4aaded76..c938c47b8 100644
--- a/public/pages/getnzb.php
+++ b/public/pages/getnzb.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\User;
 use nntmux\NZB;
 use nntmux\Releases;
 use App\Models\Settings;
@@ -18,18 +19,15 @@ if (User::isLoggedIn()) {
         Utility::showApiError(101);
     }
 } else {
-    if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_API_ONLY) {
-        $res = User::getById(0);
-    } else {
-        if (! isset($_GET['i']) || ! isset($_GET['r'])) {
-            Utility::showApiError(200);
-        }
-
-        $res = User::getByIdAndRssToken($_GET['i'], $_GET['r']);
-        if (! $res) {
-            Utility::showApiError(100);
-        }
+    if (! isset($_GET['i']) || ! isset($_GET['r'])) {
+        Utility::showApiError(200);
     }
+
+    $res = User::getByIdAndRssToken($_GET['i'], $_GET['r']);
+    if (! $res) {
+        Utility::showApiError(100);
+    }
+
     $uid = $res['id'];
     $rssToken = $res['rsstoken'];
     $maxDownloads = $res->role->downloadrequests;
diff --git a/public/pages/rss.php b/public/pages/rss.php
index 106b075a5..d708a60aa 100755
--- a/public/pages/rss.php
+++ b/public/pages/rss.php
@@ -15,11 +15,7 @@ $offset = 0;
 if (! isset($_GET['t']) && ! isset($_GET['show']) && ! isset($_GET['anidb'])) {
     // User has to either be logged in, or using rsskey.
     if (! User::isLoggedIn()) {
-        if ((int) Settings::settingValue('..registerstatus') !== Settings::REGISTER_STATUS_API_ONLY) {
-            Utility::showApiError(100);
-        } else {
-            header('Location: '.Settings::settingValue('site.main.code'));
-        }
+        header('Location: '.Settings::settingValue('site.main.code'));
     }
 
     $page->title = 'Rss Info';
@@ -59,16 +55,12 @@ if (! isset($_GET['t']) && ! isset($_GET['show']) && ! isset($_GET['anidb'])) {
         $rssToken = $page->userdata['rsstoken'];
         $maxRequests = $page->userdata->role->apirequests;
     } else {
-        if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_API_ONLY) {
-            $res = User::getById(0);
-        } else {
-            if (! isset($_GET['i']) || ! isset($_GET['r'])) {
-                Utility::showApiError(100, 'Both the User ID and API key are required for viewing the RSS!');
-            }
-
-            $res = User::getByIdAndRssToken($_GET['i'], $_GET['r']);
+        if (! isset($_GET['i']) || ! isset($_GET['r'])) {
+            Utility::showApiError(100, 'Both the User ID and API key are required for viewing the RSS!');
         }
 
+        $res = User::getByIdAndRssToken($_GET['i'], $_GET['r']);
+
         if (! $res) {
             Utility::showApiError(100);
         }