diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py
index a2d4f91ef..27480d9cf 100644
--- a/netbox/extras/signals.py
+++ b/netbox/extras/signals.py
@@ -69,6 +69,7 @@ def handle_changed_object(sender, instance, **kwargs):
         return
 
     # Record an ObjectChange if applicable
+    objectchange = instance.to_objectchange(action)
     if m2m_changed:
         qs = ObjectChange.objects.filter(
             changed_object_type=ContentType.objects.get_for_model(instance),
@@ -76,17 +77,15 @@ def handle_changed_object(sender, instance, **kwargs):
             request_id=request.id
         )
         if not qs:
-            objectchange = instance.to_objectchange(action)
             if objectchange and objectchange.has_changes:
                 objectchange.user = request.user
                 objectchange.request_id = request.id
                 objectchange.save()
         else:
             qs.update(
-                postchange_data=instance.to_objectchange(action).postchange_data
+                postchange_data=objectchange.postchange_data
             )
     else:
-        objectchange = instance.to_objectchange(action)
         if objectchange and objectchange.has_changes:
             objectchange.user = request.user
             objectchange.request_id = request.id