diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 0bdeefc99c..579438f07d 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -519,7 +519,10 @@ class InvoiceController extends BaseController
         
         $ids = request()->input('ids');
 
-        $invoices = Invoice::withTrashed()->find($this->transformKeys($ids));
+        $invoices = Invoice::withTrashed()->find($this->transformKeys($ids))->whereCompanyId(auth()->user()->companyId());
+
+        if(!$invoices)
+            return response()->json(['message'=>'No Invoices Found']);
 
         $invoices->each(function ($invoice, $key) use($action){
 
diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php
index 31d6767da7..5a19ab4a98 100644
--- a/app/Transformers/ClientTransformer.php
+++ b/app/Transformers/ClientTransformer.php
@@ -87,7 +87,7 @@ class ClientTransformer extends EntityTransformer
             'group_settings_id' => isset($client->group_settings_id) ? (string)$this->encodePrimaryKey($client->group_settings_id) : '',
             'paid_to_date' => (float) $client->paid_to_date,
             'last_login' => (int)$client->last_login,
-            'currency_id' => (int)$client->currency_id,
+            'currency_id' => (string)$client->currency_id,
             'address1' => $client->address1 ?: '',
             'address2' => $client->address2 ?: '',
             'phone' => $client->phone ?: '',