diff --git a/main.go b/main.go
index 0dfec2d5..584eeb34 100644
--- a/main.go
+++ b/main.go
@@ -61,10 +61,6 @@ func main() {
 			log.Fatal("%s", err)
 		}
 
-		if line == "" || line[0] == '#' {
-			continue
-		}
-
 		for _, cmd := range session.ParseCommands(line) {
 			if err = sess.Run(cmd); err != nil {
 				log.Error("%s", err)
diff --git a/session/session.go b/session/session.go
index cc33b633..e311c528 100644
--- a/session/session.go
+++ b/session/session.go
@@ -50,7 +50,7 @@ func ParseCommands(buffer string) []string {
 	cmds := make([]string, 0)
 	for _, cmd := range strings.Split(buffer, ";") {
 		cmd = strings.Trim(cmd, "\r\n\t ")
-		if cmd != "" {
+		if cmd != "" || (len(cmd) > 0 && cmd[0] != '#') {
 			cmds = append(cmds, cmd)
 		}
 	}