diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index 301307372ae6..45cfc2293fd8 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -576,14 +576,9 @@ class QuoteController extends BaseController
         if ($action == 'convert_to_project') {
             $quotes->each(function ($quote, $key) use ($user) {
                 if ($user->can('edit', $quote)) {
-                    $project = CloneQuoteToProjectFactory::create($quote, $user->id);
-                    
-                    if (empty($project->number)) {
-                        $project->number = $this->getNextProjectNumber($project);
-                    }
-                    $project->save();
-                    $quote->project_id = $project->id;
-                    $quote->save();
+
+                    $quote->service()->convertToProject();
+
                 }
             });
 
diff --git a/app/Services/Quote/ConvertQuoteToProject.php b/app/Services/Quote/ConvertQuoteToProject.php
index d74b05f49ebd..6b1b642cd16a 100644
--- a/app/Services/Quote/ConvertQuoteToProject.php
+++ b/app/Services/Quote/ConvertQuoteToProject.php
@@ -64,7 +64,7 @@ class ConvertQuoteToProject
                 $task->project_id = $this->quote->project_id;
                 $task->description = $item->notes;
                 $task->status_id = $task_status->id;
-                $task->rate = $item->unit_cost;
+                $task->rate = $item->cost;
                 $task_repo->save([], $task);
 
             });