diff --git a/qubes/tests/vm/init.py b/qubes/tests/vm/init.py
index 04c6f1423..6c239738d 100644
--- a/qubes/tests/vm/init.py
+++ b/qubes/tests/vm/init.py
@@ -133,6 +133,7 @@ def test_000_load(self):
         self.assertEqual(len(assignments), 1)
         self.assertEqual(assignments[0].options, {"no-strict-reset": "True"})
         self.assertEqual(assignments[0].attach_automatically, True)
+        self.assertEqual(assignments[0].frontend_domain, vm)
 
         self.assertXMLIsValid(vm.__xml__(), "relaxng/domain.rng")
 
diff --git a/qubes/vm/__init__.py b/qubes/vm/__init__.py
index ba1fe1ac9..c6df620df 100644
--- a/qubes/vm/__init__.py
+++ b/qubes/vm/__init__.py
@@ -450,6 +450,7 @@ def load_extras(self):
                             ),
                             device_id=identity,
                         ),
+                        frontend_domain=self,
                         options=options,
                         mode=mode,
                     )