diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index e1ff919a1578..f75c093fc436 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -136,6 +136,7 @@ class PreviewController extends BaseController
                     'products' => request()->design['design']['product'],
                 ]),
                 'variables' => $html->generateLabelsAndValues(),
+                'process_markdown' => $entity_obj->client->company->markdown_enabled,
             ];
 
             $design = new Design(request()->design['name']);
@@ -251,6 +252,7 @@ class PreviewController extends BaseController
                     'all_pages_header' => $entity_obj->client->getSetting('all_pages_header'),
                     'all_pages_footer' => $entity_obj->client->getSetting('all_pages_footer'),
                 ],
+                'process_markdown' => $entity_obj->client->company->markdown_enabled,
             ];
 
 
@@ -362,6 +364,7 @@ class PreviewController extends BaseController
                 'products' => request()->design['design']['product'],
             ]),
             'variables' => $html->generateLabelsAndValues(),
+            'process_markdown' => $invoice->client->company->markdown_enabled,
         ];
 
         $maker = new PdfMaker($state);
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index d8d221557a75..fe628350d0ba 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -166,6 +166,7 @@ class CreateEntityPdf implements ShouldQueue
                 'all_pages_header' => $this->entity->client->getSetting('all_pages_header'),
                 'all_pages_footer' => $this->entity->client->getSetting('all_pages_footer'),
             ],
+            'process_markdown' => $this->entity->client->company->markdown_enabled,
         ];
 
         $maker = new PdfMakerService($state);
diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index ec0beef03b97..40b24d23e502 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -153,6 +153,7 @@ class ActivityRepository extends BaseRepository
                 'all_pages_header' => $entity->client->getSetting('all_pages_header'),
                 'all_pages_footer' => $entity->client->getSetting('all_pages_footer'),
             ],
+            'process_markdown' => $entity->client->company->markdown_enabled,
         ];
 
         $maker = new PdfMakerService($state);
diff --git a/app/Services/Invoice/GenerateDeliveryNote.php b/app/Services/Invoice/GenerateDeliveryNote.php
index b0e47753ac02..83c39c6c54d4 100644
--- a/app/Services/Invoice/GenerateDeliveryNote.php
+++ b/app/Services/Invoice/GenerateDeliveryNote.php
@@ -85,6 +85,7 @@ class GenerateDeliveryNote
                 'contact' => $this->contact,
             ], 'delivery_note'),
             'variables' => $html->generateLabelsAndValues(),
+            'process_markdown' => $this->invoice->client->company->markdown_enabled,
         ];
 
         $maker = new PdfMakerService($state);
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 5cac77a073b1..9e6c64518e61 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -348,8 +348,6 @@ class Design extends BaseDesign
 
         $items = $this->transformLineItems($this->entity->line_items, $type);
 
-        $this->processMarkdownOnLineItems($items);
-
         if (count($items) == 0) {
             return [];
         }
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index e437b5ad1e8b..7d3ddb3dae05 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -92,11 +92,13 @@ trait PdfMakerUtilities
             $contains_html = false;
 
             if ($child['element'] !== 'script') {
-                $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? '');
+                if (array_key_exists('process_markdown', $this->data) && $this->data['process_markdown']) {
+                    $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? '');
+                } else {
+                    $child['content'] = array_key_exists('content', $child) ? nl2br($child['content']) : '';
+                }
             }
 
-            // $child['content'] = array_key_exists('content', $child) ? nl2br($child['content']) : '';
-
             if (isset($child['content'])) {
                 if (isset($child['is_empty']) && $child['is_empty'] === true) {
                     continue;
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index 57495c8411a2..ffd8de36823f 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -193,6 +193,7 @@ class Phantom
                 'all_pages_header' => $entity_obj->client->getSetting('all_pages_header'),
                 'all_pages_footer' => $entity_obj->client->getSetting('all_pages_footer'),
             ],
+            'process_markdown' => $entity_obj->client->company->markdown_enabled,
         ];
 
         $maker = new PdfMakerService($state);