diff --git a/public/css/custom.css b/public/css/custom.css
index 52afb1620..11c464f53 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1438,6 +1438,7 @@ table .align-items-center td span.badge {
 .item-add-new .btn-link {
     color: #55588b;
 }
+
 .item-columns-edit .btn-aka-link {
     color: #8688ad;
-}
\ No newline at end of file
+}
diff --git a/public/css/print.css b/public/css/print.css
index ef5ee0d66..2e834d8fe 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -482,3 +482,9 @@ th, td
 }
 /*--Print Reports Finish--*/
 
+.lines .empty-items:hover,
+.c-lines .empty-items:hover,
+.m-lines .empty-items:hover {
+    background-color: #f6f9fc;
+    text-decoration: none;
+}
diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue
index 535c7fe1c..ea8934ba3 100644
--- a/resources/assets/js/components/AkauntingContactCard.vue
+++ b/resources/assets/js/components/AkauntingContactCard.vue
@@ -629,7 +629,7 @@ export default {
 </script>
 
 <style>
-    .aka-error {
+    .aka-error, .aka-error:hover {
         border-color: #ef3232 !important;
         background-color: #fb634038;
     }
diff --git a/resources/lang/en-GB/documents.php b/resources/lang/en-GB/documents.php
index cceb9e463..2037ab948 100644
--- a/resources/lang/en-GB/documents.php
+++ b/resources/lang/en-GB/documents.php
@@ -2,7 +2,8 @@
 
 return [
 
-    'edit_columns' => 'Edit Columns',
+    'edit_columns'  => 'Edit Columns',
+    'empty_items'   =>'You have not added any items.',
 
     'statuses' => [
         'draft'         => 'Draft',
diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
index 0035bb213..d16e3d77f 100644
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@@ -200,20 +200,28 @@
                 </thead>
 
                 <tbody>
-                    @foreach($document->items as $item)
-                        <x-documents.template.line-item
-                            type="{{ $type }}"
-                            :item="$item"
-                            :document="$document"
-                            hide-items="{{ $hideItems }}"
-                            hide-name="{{ $hideName }}"
-                            hide-description="{{ $hideDescription }}"
-                            hide-quantity="{{ $hideQuantity }}"
-                            hide-price="{{ $hidePrice }}"
-                            hide-discount="{{ $hideDiscount }}"
-                            hide-amount="{{ $hideAmount }}"
-                        />
-                    @endforeach
+                    @if ($document->items->count())
+                        @foreach($document->items as $item)
+                            <x-documents.template.line-item
+                                type="{{ $type }}"
+                                :item="$item"
+                                :document="$document"
+                                hide-items="{{ $hideItems }}"
+                                hide-name="{{ $hideName }}"
+                                hide-description="{{ $hideDescription }}"
+                                hide-quantity="{{ $hideQuantity }}"
+                                hide-price="{{ $hidePrice }}"
+                                hide-discount="{{ $hideDiscount }}"
+                                hide-amount="{{ $hideAmount }}"
+                            />
+                        @endforeach
+                    @else
+                        <tr>
+                            <td colspan="5" class="text-center empty-items">
+                                {{ trans('documents.empty_items') }}
+                            </td>
+                        </tr>
+                    @endif
                 </tbody>
             </table>
         </div>
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
index 146eac8cf..55ef2cd51 100644
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@@ -184,20 +184,28 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($document->items as $item)
-                        <x-documents.template.line-item
-                            type="{{ $type }}"
-                            :item="$item"
-                            :document="$document"
-                            hide-items="{{ $hideItems }}"
-                            hide-name="{{ $hideName }}"
-                            hide-description="{{ $hideDescription }}"
-                            hide-quantity="{{ $hideQuantity }}"
-                            hide-price="{{ $hidePrice }}"
-                            hide-discount="{{ $hideDiscount }}"
-                            hide-amount="{{ $hideAmount }}"
-                        />
-                    @endforeach
+                    @if ($document->items->count())
+                        @foreach($document->items as $item)
+                            <x-documents.template.line-item
+                                type="{{ $type }}"
+                                :item="$item"
+                                :document="$document"
+                                hide-items="{{ $hideItems }}"
+                                hide-name="{{ $hideName }}"
+                                hide-description="{{ $hideDescription }}"
+                                hide-quantity="{{ $hideQuantity }}"
+                                hide-price="{{ $hidePrice }}"
+                                hide-discount="{{ $hideDiscount }}"
+                                hide-amount="{{ $hideAmount }}"
+                            />
+                        @endforeach
+                    @else
+                        <tr>
+                            <td colspan="5" class="text-center empty-items">
+                                {{ trans('documents.empty_items') }}
+                            </td>
+                        </tr>
+                    @endif
                 </tbody>
             </table>
         </div>
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
index 0b02bc9eb..3ed0f774b 100644
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@@ -174,20 +174,28 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($document->items as $item)
-                        <x-documents.template.line-item
-                            type="{{ $type }}"
-                            :item="$item"
-                            :document="$document"
-                            hide-items="{{ $hideItems }}"
-                            hide-name="{{ $hideName }}"
-                            hide-description="{{ $hideDescription }}"
-                            hide-quantity="{{ $hideQuantity }}"
-                            hide-price="{{ $hidePrice }}"
-                            hide-discount="{{ $hideDiscount }}"
-                            hide-amount="{{ $hideAmount }}"
-                        />
-                    @endforeach
+                    @if ($document->items->count())
+                        @foreach($document->items as $item)
+                            <x-documents.template.line-item
+                                type="{{ $type }}"
+                                :item="$item"
+                                :document="$document"
+                                hide-items="{{ $hideItems }}"
+                                hide-name="{{ $hideName }}"
+                                hide-description="{{ $hideDescription }}"
+                                hide-quantity="{{ $hideQuantity }}"
+                                hide-price="{{ $hidePrice }}"
+                                hide-discount="{{ $hideDiscount }}"
+                                hide-amount="{{ $hideAmount }}"
+                            />
+                        @endforeach
+                    @else
+                        <tr>
+                            <td colspan="5" class="text-center empty-items">
+                                {{ trans('documents.empty_items') }}
+                            </td>
+                        </tr>
+                    @endif
                 </tbody>
             </table>
         </div>