diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index b2f9aeb57a8..a9e74736d72 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -2366,6 +2366,7 @@ void WCMD_setshow_env (WCHAR *s) {
     if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) {
       errorlevel = 1;
     } else if ((!status)) WCMD_print_error();
+    else errorlevel = 0;
   }
 }
 
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index fe4c30caab9..6a19d2c578f 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -201,13 +201,13 @@ baz@space@
 @todo_wine@0
 ------------ Testing 'set' ------------
 1
-@todo_wine@0
+0
 FOOBAR not defined
 @todo_wine@  baz
 FOOBAR =  baz
-@todo_wine@0
+0
 @todo_wine@  baz2
-@todo_wine@0
+0
  bar
 @todo_wine@FOOBAR= bar
 @todo_wine@FOOBAR =  baz2