diff --git a/qubes/vm/dispvm.py b/qubes/vm/dispvm.py
index 4a388e9e5..b683ed3fc 100644
--- a/qubes/vm/dispvm.py
+++ b/qubes/vm/dispvm.py
@@ -410,7 +410,7 @@ def on_domain_pre_unpaused(
     @qubes.events.handler("domain-shutdown")
     async def on_domain_shutdown(
         self, _event, **_kwargs
-    ):  # pylint: disable=invalid-overridden-method
+    ):
         """Do auto cleanup if enabled"""
         await self._auto_cleanup()
 
diff --git a/qubes/vm/mix/net.py b/qubes/vm/mix/net.py
index 24702cdaf..b289b77a1 100644
--- a/qubes/vm/mix/net.py
+++ b/qubes/vm/mix/net.py
@@ -306,7 +306,7 @@ def on_domain_load_netvm_loop_check(self, event):
             self.netvm = None
 
     @qubes.events.handler("domain-shutdown")
-    def on_domain_shutdown(self, event, **kwargs):
+    def on_domain_shutdown_net(self, event, **kwargs):
         """Cleanup network interfaces of connected, running VMs.
 
         This will allow re-reconnecting them cleanly later.