diff --git a/app/Factory/ExpenseCategoryFactory.php b/app/Factory/ExpenseCategoryFactory.php
index 00a6d28bcb9e..ef85e48e4dea 100644
--- a/app/Factory/ExpenseCategoryFactory.php
+++ b/app/Factory/ExpenseCategoryFactory.php
@@ -22,7 +22,8 @@ class ExpenseCategoryFactory
         $expense->company_id = $company_id;
         $expense->name = '';
         $expense->is_deleted = false;
-
+        $expense->color = '#fff';
+        
         return $expense;
     }
 }
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index df5185a7bcd5..bffb4012c265 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -62,6 +62,9 @@ class StoreExpenseRequest extends Request
             $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
         }
 
+        if(array_key_exists('color', $input) && is_null($input['color']))
+            $input['color'] = '#fff';
+
         $this->replace($input);
     }
 
diff --git a/app/Http/Requests/Project/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php
index cbd5a6ce276b..baa10e61d961 100644
--- a/app/Http/Requests/Project/StoreProjectRequest.php
+++ b/app/Http/Requests/Project/StoreProjectRequest.php
@@ -49,6 +49,10 @@ class StoreProjectRequest extends Request
     {
         $input = $this->decodePrimaryKeys($this->all());
 
+
+        if(array_key_exists('color', $input) && is_null($input['color']))
+            $input['color'] = '#fff';
+        
         $this->replace($input);
     }
 
diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php
index 4980b99276aa..6c8c3f9fe9b4 100644
--- a/app/Http/Requests/Project/UpdateProjectRequest.php
+++ b/app/Http/Requests/Project/UpdateProjectRequest.php
@@ -48,6 +48,9 @@ class UpdateProjectRequest extends Request
             unset($input['client_id']);
         }
 
+        if(array_key_exists('color', $input) && is_null($input['color']))
+            $input['color'] = '#fff';
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php
index 207a0173d74e..06bd80cbc6a6 100644
--- a/app/Http/Requests/Task/UpdateTaskRequest.php
+++ b/app/Http/Requests/Task/UpdateTaskRequest.php
@@ -50,6 +50,9 @@ class UpdateTaskRequest extends Request
             $input['status_id'] = $this->decodePrimaryKey($input['status_id']);
         }
         
+        if(array_key_exists('color', $input) && is_null($input['color']))
+            $input['color'] = '#fff';
+
         $this->replace($input);
     }
 }
diff --git a/tests/Feature/CompanyGatewayResolutionTest.php b/tests/Feature/CompanyGatewayResolutionTest.php
index 2860b57961ad..5b37ef4b9f70 100644
--- a/tests/Feature/CompanyGatewayResolutionTest.php
+++ b/tests/Feature/CompanyGatewayResolutionTest.php
@@ -104,8 +104,8 @@ class CompanyGatewayResolutionTest extends TestCase
     {
         $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false);
         $this->assertEquals(0.2, $fee);
-        $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false);
-        $this->assertEquals(0.1, $fee);
+        // $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false);
+        // $this->assertEquals(0.1, $fee);
     }
 
     /**