diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 44315a4f..8f6c7d0c 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1322,7 +1322,7 @@ class QubesVm(object):
             if notify_function is not None:
                 notify_function("error", "ERROR: Cannot start the Qubes Clipboard Notifier!")
 
-    def start(self, debug_console = False, verbose = False, preparing_dvm = False):
+    def start(self, debug_console = False, verbose = False, preparing_dvm = False, start_guid = True):
         if dry_run:
             return
 
@@ -1405,7 +1405,7 @@ class QubesVm(object):
                 self.force_shutdown()
                 raise OSError ("ERROR: Cannot execute qrexec_daemon!")
 
-        if not preparing_dvm and os.path.exists('/var/run/shm.id'):
+        if start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'):
             self.start_guid(verbose=verbose)
 
         if preparing_dvm:
diff --git a/dom0/qvm-tools/qvm-start b/dom0/qvm-tools/qvm-start
index 23027c03..4ee41b6f 100755
--- a/dom0/qvm-tools/qvm-start
+++ b/dom0/qvm-tools/qvm-start
@@ -62,7 +62,7 @@ def main():
 
     try:
         vm.verify_files()
-        xid = vm.start(debug_console=options.debug_console, verbose=options.verbose, preparing_dvm=options.preparing_dvm)
+        xid = vm.start(debug_console=options.debug_console, verbose=options.verbose, preparing_dvm=options.preparing_dvm, start_guid=not options.noguid)
     except (IOError, OSError, QubesException) as err:
         print >> sys.stderr, "ERROR: {0}".format(err)
         exit (1)