diff --git a/src/expander/expander_parse_string.c b/src/expander/expander_parse_string.c
index a8752ac..42253bf 100644
--- a/src/expander/expander_parse_string.c
+++ b/src/expander/expander_parse_string.c
@@ -40,9 +40,9 @@ char	*expander_parse_string(char *s, t_minishell *msh)
 	current = variables;
 	i = 0;
 	j = 0;
-	while (s[i] && current)
+	while (s[i])
 	{
-		if (s[i] == '$' && s[i + 1])
+		if (s[i] == '$' && s[i + 1] && current)
 		{
 			i++;
 			i += expander_expand_dollar(s + i, string, &j, current);