diff --git a/netbox_branching/models/changes.py b/netbox_branching/models/changes.py
index 68e91a0..72fc4dd 100644
--- a/netbox_branching/models/changes.py
+++ b/netbox_branching/models/changes.py
@@ -191,6 +191,9 @@ def _update_conflicts(self):
         """
         Record any conflicting changes between the modified and current object data.
         """
+        if self.original is None or self.current is None:
+            # Both the original and current states must be available to compare
+            return
         conflicts = None
         if self.action == ObjectChangeActionChoices.ACTION_UPDATE:
             conflicts = [