diff --git a/src/backend/InvenTree/InvenTree/apps.py b/src/backend/InvenTree/InvenTree/apps.py
index 6fae28f69f..0e0c8d308a 100644
--- a/src/backend/InvenTree/InvenTree/apps.py
+++ b/src/backend/InvenTree/InvenTree/apps.py
@@ -177,7 +177,7 @@ class InvenTreeConfig(AppConfig):
         try:
             if django_q.models.OrmQ.objects.count() == 0:
                 InvenTree.tasks.offload_task(
-                    InvenTree.tasks.heartbeat, force_async=True
+                    InvenTree.tasks.heartbeat, force_async=True, group='heartbeat'
                 )
         except Exception:
             pass
diff --git a/src/backend/InvenTree/data_exporter/mixins.py b/src/backend/InvenTree/data_exporter/mixins.py
index 7e4229c601..af3ddc9fa1 100644
--- a/src/backend/InvenTree/data_exporter/mixins.py
+++ b/src/backend/InvenTree/data_exporter/mixins.py
@@ -460,6 +460,7 @@ class DataExportViewMixin:
                 export_format,
                 export_context,
                 output.id,
+                group='exporter',
             )
 
             output.refresh_from_db()
diff --git a/src/backend/InvenTree/importer/models.py b/src/backend/InvenTree/importer/models.py
index c634f741cd..f1c21ca86d 100644
--- a/src/backend/InvenTree/importer/models.py
+++ b/src/backend/InvenTree/importer/models.py
@@ -265,7 +265,7 @@ class DataImportSession(models.Model):
         self.status = DataImportStatusCode.IMPORTING.value
         self.save()
 
-        offload_task(importer.tasks.import_data, self.pk)
+        offload_task(importer.tasks.import_data, self.pk, group='importer')
 
     def import_data(self) -> None:
         """Perform the data import process for this session."""
diff --git a/src/backend/InvenTree/stock/models.py b/src/backend/InvenTree/stock/models.py
index b0a4e1b63a..6e3a4d1d0c 100644
--- a/src/backend/InvenTree/stock/models.py
+++ b/src/backend/InvenTree/stock/models.py
@@ -1801,7 +1801,7 @@ class StockItem(
 
         # Rebuild the stock tree
         InvenTree.tasks.offload_task(
-            stock.tasks.rebuild_stock_item_tree, tree_id=self.tree_id, group='part'
+            stock.tasks.rebuild_stock_item_tree, tree_id=self.tree_id, group='stock'
         )
 
     @transaction.atomic