diff --git a/netbox/circuits/migrations/0047_circuittermination__termination.py b/netbox/circuits/migrations/0047_circuittermination__termination.py
index 6a6d08502..0b0c6233c 100644
--- a/netbox/circuits/migrations/0047_circuittermination__termination.py
+++ b/netbox/circuits/migrations/0047_circuittermination__termination.py
@@ -68,8 +68,6 @@ def oc_circuittermination_termination(objectchange, reverting):
                 'termination_type': provider_network_ct,
                 'termination_id': provider_network_id,
             })
-        data.pop('site', None)
-        data.pop('provider_network', None)
 
 
 objectchange_migrators = {
diff --git a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
index cd228b661..f2676c2ee 100644
--- a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
+++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py
@@ -86,3 +86,15 @@ class Migration(migrations.Migration):
             new_name='_provider_network',
         ),
     ]
+
+
+def oc_circuittermination_remove_fields(objectchange, reverting):
+    for data in (objectchange.prechange_data, objectchange.postchange_data):
+        if data is not None:
+            data.pop('site', None)
+            data.pop('provider_network', None)
+
+
+objectchange_migrators = {
+    'circuits.circuittermination': oc_circuittermination_remove_fields,
+}
diff --git a/netbox/ipam/migrations/0071_prefix_scope.py b/netbox/ipam/migrations/0071_prefix_scope.py
index af3659303..bf80f9b5e 100644
--- a/netbox/ipam/migrations/0071_prefix_scope.py
+++ b/netbox/ipam/migrations/0071_prefix_scope.py
@@ -57,7 +57,6 @@ def oc_prefix_scope(objectchange, reverting):
                 'scope_type': site_ct,
                 'scope_id': site_id,
             })
-        data.pop('site', None)
 
 
 objectchange_migrators = {
diff --git a/netbox/ipam/migrations/0072_prefix_cached_relations.py b/netbox/ipam/migrations/0072_prefix_cached_relations.py
index c46f5b1a4..1dcc55a74 100644
--- a/netbox/ipam/migrations/0072_prefix_cached_relations.py
+++ b/netbox/ipam/migrations/0072_prefix_cached_relations.py
@@ -60,3 +60,14 @@ class Migration(migrations.Migration):
             name='site',
         ),
     ]
+
+
+def oc_prefix_remove_fields(objectchange, reverting):
+    for data in (objectchange.prechange_data, objectchange.postchange_data):
+        if data is not None:
+            data.pop('site', None)
+
+
+objectchange_migrators = {
+    'ipam.prefix': oc_prefix_remove_fields,
+}
diff --git a/netbox/ipam/migrations/0080_populate_service_parent.py b/netbox/ipam/migrations/0080_populate_service_parent.py
index df4e03af7..bd9d1c8b5 100644
--- a/netbox/ipam/migrations/0080_populate_service_parent.py
+++ b/netbox/ipam/migrations/0080_populate_service_parent.py
@@ -73,8 +73,6 @@ def oc_service_parent(objectchange, reverting):
                 'parent_object_type': virtual_machine_ct,
                 'parent_object_id': virtual_machine_id,
             })
-        data.pop('device', None)
-        data.pop('virtual_machine', None)
 
 
 objectchange_migrators = {
diff --git a/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py b/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
index 03b63cd12..f026fc654 100644
--- a/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
+++ b/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
@@ -37,3 +37,15 @@ class Migration(migrations.Migration):
             ),
         ),
     ]
+
+
+def oc_service_remove_fields(objectchange, reverting):
+    for data in (objectchange.prechange_data, objectchange.postchange_data):
+        if data is not None:
+            data.pop('device', None)
+            data.pop('virtual_machine', None)
+
+
+objectchange_migrators = {
+    'ipam.service': oc_service_remove_fields,
+}
diff --git a/netbox/virtualization/migrations/0044_cluster_scope.py b/netbox/virtualization/migrations/0044_cluster_scope.py
index 7664d34f0..da5a94ac3 100644
--- a/netbox/virtualization/migrations/0044_cluster_scope.py
+++ b/netbox/virtualization/migrations/0044_cluster_scope.py
@@ -56,7 +56,6 @@ def oc_cluster_scope(objectchange, reverting):
                 'scope_type': site_ct,
                 'scope_id': site_id,
             })
-        data.pop('site', None)
 
 
 objectchange_migrators = {
diff --git a/netbox/virtualization/migrations/0045_clusters_cached_relations.py b/netbox/virtualization/migrations/0045_clusters_cached_relations.py
index 71a6129b7..c741be4fa 100644
--- a/netbox/virtualization/migrations/0045_clusters_cached_relations.py
+++ b/netbox/virtualization/migrations/0045_clusters_cached_relations.py
@@ -87,3 +87,14 @@ class Migration(migrations.Migration):
             ),
         ),
     ]
+
+
+def oc_cluster_remove_site(objectchange, reverting):
+    for data in (objectchange.prechange_data, objectchange.postchange_data):
+        if data is not None:
+            data.pop('site', None)
+
+
+objectchange_migrators = {
+    'virtualization.cluster': oc_cluster_remove_site,
+}