diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php
index e97d5d4c1a00..6dab0aa252c7 100644
--- a/app/Http/Requests/Task/StoreTaskRequest.php
+++ b/app/Http/Requests/Task/StoreTaskRequest.php
@@ -95,6 +95,14 @@ class StoreTaskRequest extends Request
             }
         }
 
+        if (isset($input['project_id']) && isset($input['client_id'])) {
+            $search_project_with_client = Project::withTrashed()->where('id', $input['project_id'])->where('client_id', $input['client_id'])->company()->doesntExist();
+
+            if ($search_project_with_client) {
+                unset($input['project_id']);
+            }
+        }
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php
index bdf3d653a6e9..7107df9fe63f 100644
--- a/app/Http/Requests/Task/UpdateTaskRequest.php
+++ b/app/Http/Requests/Task/UpdateTaskRequest.php
@@ -104,6 +104,15 @@ class UpdateTaskRequest extends Request
             $input['color'] = '';
         }
 
+        if(isset($input['project_id']) && isset($input['client_id'])){
+            $search_project_with_client = Project::withTrashed()->where('id', $input['project_id'])->where('client_id', $input['client_id'])->company()->doesntExist();
+
+            if($search_project_with_client){
+                unset($input['project_id']);
+            }
+
+        }
+
         $this->replace($input);
     }
 
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 9ec044d7db4a..d60fa8939f3e 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -356,6 +356,11 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         }
 
+        if(strlen($invoice_list) < 4){
+                $invoice_list = Number::formatMoney($this->payment->amount, $this->client) ?: '&nbsp;';
+        }
+            
+
         return $invoice_list;
 
     }