diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 83773fe48a..0ef766d19d 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -1111,6 +1111,13 @@ class InvenTreeSetting(BaseInvenTreeSetting):
             'default': 'SO',
         },
 
+        'SALESORDER_DEFAULT_SHIPMENT': {
+            'name': _('Sales Order Default Shipment'),
+            'description': _('Enable creation of default shipment with sales orders'),
+            'default': False,
+            'validator': bool,
+        },
+        
         'PURCHASEORDER_REFERENCE_PREFIX': {
             'name': _('Purchase Order Reference Prefix'),
             'description': _('Prefix value for purchase order reference'),
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index 7460e81e56..58f4fd5c2f 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -12,6 +12,8 @@ from decimal import Decimal
 from django.db import models, transaction
 from django.db.models import Q, F, Sum
 from django.db.models.functions import Coalesce
+from django.db.models.signals import post_save
+from django.dispatch.dispatcher import receiver
 
 from django.core.validators import MinValueValidator
 from django.core.exceptions import ValidationError
@@ -808,6 +810,20 @@ class SalesOrder(Order):
     def pending_shipment_count(self):
         return self.pending_shipments().count()
 
+@receiver(post_save, sender=SalesOrder, dispatch_uid='build_post_save_log')
+def after_save_sales_order(sender, instance: SalesOrder, created: bool, **kwargs):
+    """
+    Callback function to be executed after a SalesOrder instance is saved
+    """
+    if created and getSetting('SALESORDER_DEFAULT_SHIPMENT'):
+        # A new SalesOrder has just been created
+
+        # Create default shipment
+        SalesOrderShipment.objects.create(
+            order=instance,
+            reference='1',
+        )
+
 
 class PurchaseOrderAttachment(InvenTreeAttachment):
     """
diff --git a/InvenTree/templates/InvenTree/settings/so.html b/InvenTree/templates/InvenTree/settings/so.html
index e6fde3a093..ac84f5fa86 100644
--- a/InvenTree/templates/InvenTree/settings/so.html
+++ b/InvenTree/templates/InvenTree/settings/so.html
@@ -12,6 +12,7 @@
 <table class='table table-striped table-condensed'>
     <tbody>
         {% include "InvenTree/settings/setting.html" with key="SALESORDER_REFERENCE_PREFIX" %}
+        {% include "InvenTree/settings/setting.html" with key="SALESORDER_DEFAULT_SHIPMENT" icon="fa-truck-loading" %}
     </tbody>
 </table>