diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat
index c69a5f94bd9..4efcedbd20b 100644
--- a/cmd/run_konan.bat
+++ b/cmd/run_konan.bat
@@ -94,7 +94,8 @@ goto :eof
 :set_path
   rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded.
   rem TODO: remove this hack.
-  set "PATH=%USERPROFILE%\.konan\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
+  if ("%KONAN_DATA_DIR%"=="") (set KONAN_DATA_DIR=%USERPROFILE%\.konan)
+  set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
 goto :eof
 
 :end
diff --git a/samples/zephyr/build.bat b/samples/zephyr/build.bat
index ae42543835c..5063d45a402 100644
--- a/samples/zephyr/build.bat
+++ b/samples/zephyr/build.bat
@@ -6,7 +6,7 @@ set ZEPHYR_BASE=%userprofile%\zephyr
 set TOOLCHAIN=gcc-arm-none-eabi-7-2017-q4-major-win32
 
 set DIR=%~dp0
-if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR="%HOME%\.konan")
+if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR=%userprofile%\.konan)
 set KONAN_DEPS=%KONAN_DATA_DIR%/dependencies
 set GCC_ARM=%KONAN_DEPS%/%TOOLCHAIN%
 set ZEPHYR_TOOLCHAIN_VARIANT=gccarmemb