diff --git a/app/Http/Controllers/Import/Instagram.php b/app/Http/Controllers/Import/Instagram.php
index bde316e1..39d1d4d2 100644
--- a/app/Http/Controllers/Import/Instagram.php
+++ b/app/Http/Controllers/Import/Instagram.php
@@ -15,10 +15,13 @@ use App\Jobs\ImportPipeline\ImportInstagram;
 
 trait Instagram
 {
-    public function instagram()
-    {
-      return view('settings.import.instagram.home');
-    }
+	public function instagram()
+	{
+		if(config_cache('pixelfed.import.instagram.enabled') != true) {
+			abort(404, 'Feature not enabled');
+		}
+		return view('settings.import.instagram.home');
+	}
 
     public function instagramStart(Request $request)
     {	
diff --git a/app/Http/Controllers/Import/Mastodon.php b/app/Http/Controllers/Import/Mastodon.php
index 14aa48f7..243cefc3 100644
--- a/app/Http/Controllers/Import/Mastodon.php
+++ b/app/Http/Controllers/Import/Mastodon.php
@@ -6,8 +6,11 @@ use Illuminate\Http\Request;
 
 trait Mastodon
 {
-    public function mastodon()
-    {
-      return view('settings.import.mastodon.home');
-    }
+	public function mastodon()
+	{
+		if(config_cache('pixelfed.import.instagram.enabled') != true) {
+			abort(404, 'Feature not enabled');
+		}
+		return view('settings.import.mastodon.home');
+	}
 }
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 9885455e..4a7a27e7 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -11,10 +11,6 @@ class ImportController extends Controller
 	public function __construct()
 	{
 		$this->middleware('auth');
-
-		if(config_cache('pixelfed.import.instagram.enabled') != true) {
-			abort(404, 'Feature not enabled');
-		}
 	}
 
 }
diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php
index 13d1f451..b176e03d 100644
--- a/app/Http/Controllers/PollController.php
+++ b/app/Http/Controllers/PollController.php
@@ -11,14 +11,10 @@ use App\Services\FollowerService;
 
 class PollController extends Controller
 {
-
-	public function __construct()
-	{
-		abort_if(!config_cache('instance.polls.enabled'), 404);
-	}
-
 	public function getPoll(Request $request, $id)
 	{
+		abort_if(!config_cache('instance.polls.enabled'), 404);
+
 		$poll = Poll::findOrFail($id);
 		$status = Status::findOrFail($poll->status_id);
 		if($status->scope != 'public') {
@@ -34,6 +30,8 @@ class PollController extends Controller
 
     public function vote(Request $request, $id)
     {
+		abort_if(!config_cache('instance.polls.enabled'), 404);
+
     	abort_unless($request->user(), 403);
 
     	$this->validate($request, [