diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 48ec01b898aa..804e4cd91ade 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -12,8 +12,9 @@
 namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ClientPortal\ProcessInvoicesInBulkRequest;
-use App\Http\Requests\ClientPortal\ShowInvoiceRequest;
+use App\Http\Requests\ClientPortal\Invoices\ShowInvoicesRequest;
+use App\Http\Requests\ClientPortal\Invoices\ProcessInvoicesInBulkRequest;
+use App\Http\Requests\ClientPortal\Invoices\ShowInvoiceRequest;
 use App\Models\Invoice;
 use App\Utils\Number;
 use App\Utils\TempFile;
@@ -33,7 +34,7 @@ class InvoiceController extends Controller
      *
      * @return Factory|View
      */
-    public function index()
+    public function index(ShowInvoicesRequest $request)
     {
         return $this->render('invoices.index');
     }
diff --git a/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php
new file mode 100644
index 000000000000..512874a3806a
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\Invoices;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProcessInvoicesInBulkRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+    }
+
+    public function rules()
+    {
+        return [
+            'invoices' => ['array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
similarity index 73%
rename from app/Http/Requests/ClientPortal/ShowInvoiceRequest.php
rename to app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
index 3ecae8046509..f272521d0821 100644
--- a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php
+++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
@@ -9,9 +9,10 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace App\Http\Requests\ClientPortal;
+namespace App\Http\Requests\ClientPortal\Invoices;
 
 use App\Http\Requests\Request;
+use App\Http\ViewComposers\PortalComposer;
 
 class ShowInvoiceRequest extends Request
 {
@@ -22,6 +23,7 @@ class ShowInvoiceRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth('contact')->user()->client->id == $this->invoice->client_id;
+        return auth('contact')->user()->client->id == $this->invoice->client_id
+            &&  auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
     }
 }
diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php
new file mode 100644
index 000000000000..8a815d95549c
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\Invoices;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowInvoicesRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/ProcessInvoicesInBulkRequest.php b/app/Http/Requests/ClientPortal/ProcessInvoicesInBulkRequest.php
deleted file mode 100644
index 9a41f91069da..000000000000
--- a/app/Http/Requests/ClientPortal/ProcessInvoicesInBulkRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Requests\ClientPortal;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ProcessInvoicesInBulkRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true; // TODO.
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'invoices' => ['array'],
-        ];
-    }
-}