diff --git a/session/session.go b/session/session.go
index 990db53d..1f5a916c 100644
--- a/session/session.go
+++ b/session/session.go
@@ -187,7 +187,11 @@ func (s *Session) setupReadline() error {
 				tree[name] = []string{}
 			}
 
-			tree[name] = append(tree[name], parts[1:]...)
+			var appendedOption = strings.Join(parts[1:], " ")
+
+			if len(appendedOption) > 0 {
+				tree[name] = append(tree[name], appendedOption)
+			}
 		}
 	}