diff --git a/vm_manager/vm_manager_cmd.py b/vm_manager/vm_manager_cmd.py
index 226a727..4ec63fe 100755
--- a/vm_manager/vm_manager_cmd.py
+++ b/vm_manager/vm_manager_cmd.py
@@ -530,10 +530,7 @@ def main():
     if args.command == "list":
         print("\n".join(vm_manager.list_vms()))
     elif args.command == "start":
-        if vm_manager.cluster_mode:
-            vm_manager.start(args.name)
-        else:
-            vm_manager.start(args.name, autostart=not args.no_autostart)
+        vm_manager.start(args.name)
     elif args.command == "stop":
         vm_manager.stop(args.name, force=args.force)
     elif args.command == "remove":
diff --git a/vm_manager/vm_manager_libvirt.py b/vm_manager/vm_manager_libvirt.py
index ff0b564..736fcfb 100644
--- a/vm_manager/vm_manager_libvirt.py
+++ b/vm_manager/vm_manager_libvirt.py
@@ -51,7 +51,7 @@ def create(args):
 
     with LibVirtManager() as lvm:
         lvm.define(xml)
-        if args.get("autostart"):
+        if not args.get("no_autostart"):
             lvm.set_autostart(args.get("name"), True)
 
     logger.info("VM " + args.get("name") + " created successfully")