diff --git a/app/Controllers/ClaimController.php b/app/Controllers/ClaimController.php
index b9428f0..7dc6d2c 100644
--- a/app/Controllers/ClaimController.php
+++ b/app/Controllers/ClaimController.php
@@ -179,10 +179,10 @@ class ClaimController extends ResourceController
             $claimData = [
                 'claim_status_id'          => $reqData['claim_status_id'] ?? $status['id'],
                 'policy_id'                => $policy['id'] ?? null,
-                'policy_no'                => $policy['policy_number'] ?? null,
+                'policy_no'                => $policy['policy_number'] ?? $reqData['policy_number'] ?? null,
                 'claim_number'             => $reqData['claim_number'] ?? null,
                 'policy_from'              => $reqData['policy_from'],
-                'insurer_id'               => $policy['insurer_id'] ?? null,
+                'insurer_id'               => $policy['insurer_id'] ?? $reqData['insurer_id'] ?? null,
                 'broker_id'                => $reqData['broker_id'] ?? $policy['broker_id'] ?? null,
                 'insured_name'             => $reqData['insured_name'] ?? $policy['insured_name'] ?? null,
                 'mobile'                   => $reqData['mobile'] ?? $policy['client_mobile'] ?? null,