diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index 11c266ac8f46..6a941b1fa394 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -144,7 +144,7 @@ class StoreRecurringInvoiceRequest extends Request
             unset($input['number']);
         }
 
-        if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) {
+        if (array_key_exists('exchange_rate', $input) && (is_null($input['exchange_rate']) || $input['exchange_rate'] == 0)) {
             $input['exchange_rate'] = 1;
         }
 
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index 26cc4e2f44de..a7d54fd235e2 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -122,7 +122,7 @@ class UpdateRecurringInvoiceRequest extends Request
             unset($input['documents']);
         }
 
-        if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) {
+        if (array_key_exists('exchange_rate', $input) && (is_null($input['exchange_rate']) || $input['exchange_rate'] == 0)) {
             $input['exchange_rate'] = 1;
         }
 
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 5d6ef871dbd9..0019a6efed40 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -765,7 +765,8 @@ class BaseImport
     {
         $keys = array_shift($data);
         ksort($keys);
-
+// nlog($data);
+// nlog($keys);
         return array_map(function ($values) use ($keys) {
             return array_combine($keys, $values);
         }, $data);