diff --git a/InvenTree/plugin/events.py b/InvenTree/plugin/events.py
index f777621a45..21c68d0a7c 100644
--- a/InvenTree/plugin/events.py
+++ b/InvenTree/plugin/events.py
@@ -124,6 +124,8 @@ def allow_table_event(table_name):
 
     ignore_tables = [
         'common_notificationentry',
+        'common_webhookendpoint',
+        'common_webhookmessage',
     ]
 
     if table_name in ignore_tables:
@@ -140,6 +142,11 @@ def after_save(sender, instance, created, **kwargs):
 
     table = sender.objects.model._meta.db_table
 
+    instance_id = getattr(instance, 'id', None)
+
+    if instance_id is None:
+        return
+
     if not allow_table_event(table):
         return