diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 74a48701..c19308c5 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -152,12 +152,12 @@ Use -- to separate script command line args from bb command line args.
     (let [k (first command-line-args)
           k (keyword (subs k 1))
           task (get-in @bb-edn [:tasks k])
-          {:keys [:args]} (decode-task task)
-          main (first args)
+          {:keys [:task :args]} (decode-task task)
           help-text (:help (meta task))]
       (if help-text
         [(println help-text) 0]
-        (if main
+        (if-let [main (when (= :main task)
+                        (first args))]
           (let [main (if (simple-symbol? main)
                        (symbol (str main) "-main")
                        main)]