diff --git a/agentstack/main.py b/agentstack/main.py
index 858ae2d6..ff512982 100644
--- a/agentstack/main.py
+++ b/agentstack/main.py
@@ -187,11 +187,11 @@ def main():
             pass  # Update check already done
 
         # inside project dir commands only
-        conf.assert_project()
-
-        if args.command in ["run", "r"]:
+        elif args.command in ["run", "r"]:
+            conf.assert_project()
             run_project(command=args.function, debug=args.debug, cli_args=extra_args)
         elif args.command in ['generate', 'g']:
+            conf.assert_project()
             if args.generate_command in ['agent', 'a']:
                 if not args.llm:
                     configure_default_model()
@@ -201,6 +201,7 @@ def main():
             else:
                 generate_parser.print_help()
         elif args.command in ['export', 'e']:
+            conf.assert_project()
             export_template(args.filename)
         else:
             parser.print_help()