diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index 55cd5351c..4e61e4fe2 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -874,6 +874,22 @@ def on_property_pre_del_autostart(self, event, name, oldvalue=None):
                 raise qubes.exc.QubesException(
                     'Failed to reset autostart for VM in systemd')
 
+    @qubes.events.handler('domain-remove-from-disk')
+    def on_remove_from_disk(self, event, **kwargs):
+        # pylint: disable=unused-argument
+        if self.autostart:
+            subprocess.call(
+                ['sudo', 'systemctl', 'disable',
+                    'qubes-vm@{}.service'.format(self.name)])
+
+    @qubes.events.handler('domain-create-on-disk')
+    def on_create_on_disk(self, event, **kwargs):
+        # pylint: disable=unused-argument
+        if self.autostart:
+            subprocess.call(
+                ['sudo', 'systemctl', 'enable',
+                    'qubes-vm@{}.service'.format(self.name)])
+
     #
     # methods for changing domain state
     #