diff --git a/app/Http/Requests/Report/GenericReportRequest.php b/app/Http/Requests/Report/GenericReportRequest.php
index b0a311ee5630..2e963adeacef 100644
--- a/app/Http/Requests/Report/GenericReportRequest.php
+++ b/app/Http/Requests/Report/GenericReportRequest.php
@@ -12,6 +12,7 @@
 namespace App\Http\Requests\Report;
 
 use App\Http\Requests\Request;
+use Illuminate\Validation\Rule;
 
 class GenericReportRequest extends Request
 {
@@ -27,11 +28,14 @@ class GenericReportRequest extends Request
 
     public function rules()
     {
+        nlog($this->date_range);
+
         return [
-            'start_date' => 'string|date',
-            'end_date' => 'string|date',
-            'date_key' => 'string',
-            'date_range' => 'sometimes|string',
+            'date_range' => 'bail|required|string',
+            // 'start_date' => [Rule::requiredIf($this->date_range === 'custom')],
+            // 'end_date' => [Rule::requiredIf($this->date_range === 'custom')],
+            'end_date' => 'bail|required_if:date_range,custom|nullable|date',
+            'start_date' => 'bail|required_if:date_range,custom|nullable|date',
             'report_keys' => 'present|array',
             'send_email' => 'required|bool',
         ];
diff --git a/app/Http/Requests/Report/ProfitLossRequest.php b/app/Http/Requests/Report/ProfitLossRequest.php
index 3b3e7802d010..65dc03ce66b0 100644
--- a/app/Http/Requests/Report/ProfitLossRequest.php
+++ b/app/Http/Requests/Report/ProfitLossRequest.php
@@ -28,8 +28,8 @@ class ProfitLossRequest extends Request
     public function rules()
     {
         return [
-            'start_date' => 'string|date',
-            'end_date' => 'string|date',
+            'start_date' => 'required_if:date_range,custom|string|date',
+            'end_date' => 'required_if:date_range,custom|string|date',
             'is_income_billed' => 'required|bail|bool',
             'is_expense_billed' => 'bool',
             'include_tax' => 'required|bail|bool',