diff --git a/modules/cli/zsh/init.zsh b/modules/cli/zsh/init.zsh
index de7e0c9..caa68cf 100644
--- a/modules/cli/zsh/init.zsh
+++ b/modules/cli/zsh/init.zsh
@@ -130,12 +130,10 @@ dotenv() {
 		shift
 	fi
 
-	ENV=$(cat $DOTENV | sed '/^#/d' | tr '\n' ' ')
-
 	if [[ -z $* ]]; then
-		export ${=ENV}
+		set -a && source $DOTENV && set +a
 	else
-		(export ${=ENV}; $*)
+		(set -a && source $DOTENV && set +a && $*)
 	fi
 }