diff --git a/app/Services/EstimateService.php b/app/Services/EstimateService.php
index e6d97fe2..f39b12f6 100644
--- a/app/Services/EstimateService.php
+++ b/app/Services/EstimateService.php
@@ -358,6 +358,19 @@ class EstimateService
             $this->documentItemService->createTaxes($invoice, $estimate->taxes->toArray());
         }
 
+        if ($estimate->fields()->exists()) {
+            $customFields = [];
+
+            foreach ($estimate->fields as $data) {
+                $customFields[] = [
+                    'id' => $data->custom_field_id,
+                    'value' => $data->defaultAnswer,
+                ];
+            }
+
+            $invoice->addCustomFields($customFields);
+        }
+
         $estimate->checkForEstimateConvertAction();
 
         return Invoice::find($invoice->id);