diff --git a/qubes/app.py b/qubes/app.py
index 2a00355b7..7edfea3dc 100644
--- a/qubes/app.py
+++ b/qubes/app.py
@@ -1593,3 +1593,12 @@ def on_property_set_default_dispvm(self, event, name, newvalue,
                 # resetting dispvm to its default value
                 vm.fire_event('property-reset:default_dispvm',
                               name='default_dispvm', oldvalue=oldvalue)
+
+    @qubes.events.handler('property-pre-set:default_kernel')
+    def on_property_pre_set_default_kernel(self, event, name, newvalue,
+                                           oldvalue=None):
+        # pylint: disable=unused-argument
+        kernels = [kernel.vid for kernel in self.pools['linux-kernel'].volumes]
+        if not newvalue in kernels:
+            raise qubes.exc.QubesException(
+                    'Invalid kernel: {} !'.format(newvalue))