diff --git a/src/executing/simple_cmd/builtin_cd.c b/src/executing/simple_cmd/builtin_cd.c
index 8d8fb0d..98749f1 100644
--- a/src/executing/simple_cmd/builtin_cd.c
+++ b/src/executing/simple_cmd/builtin_cd.c
@@ -6,7 +6,7 @@
 /*   By: khais <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/31 16:20:17 by khais             #+#    #+#             */
-/*   Updated: 2025/03/31 16:56:16 by khais            ###   ########.fr       */
+/*   Updated: 2025/03/31 17:05:21 by khais            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,9 @@
 
 static void	ft_chdir(char *path, t_minishell *app)
 {
-	if (chdir(path) == 0)
+	if (path[0] == '\0')
+		app->last_return_value = 0;
+	else if (chdir(path) == 0)
 		app->last_return_value = 0;
 	else
 	{
diff --git a/test.sh b/test.sh
index 4300d33..2d0fa30 100755
--- a/test.sh
+++ b/test.sh
@@ -210,6 +210,23 @@ minishell: cd: HOME not set
 /tmp/dir.minishell
 EOF
 
+when_run <<EOF "cd with empty argument"
+cd ""
+pwd
+EOF
+expecting <<EOF
+/tmp/dir.minishell
+EOF
+
+EXTRAENV="HOME="
+when_run <<EOF "cd with no arguments and HOME equal to empty string"
+cd
+pwd
+EOF
+expecting <<EOF
+/tmp/dir.minishell
+EOF
+
 when_run <<EOF "quoted parentheses are not operators"
 echo unclosed '('
 EOF