diff --git a/modules/distribution/src/core/bin/iot-server.bat b/modules/distribution/src/core/bin/iot-server.bat
index 5489845a..051c4eaa 100644
--- a/modules/distribution/src/core/bin/iot-server.bat
+++ b/modules/distribution/src/core/bin/iot-server.bat
@@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ----------------------------
 cd %CARBON_HOME%
 
 rem ------------------ Remove tmp folder on startup -----------------------------
+IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work
 set TMP_DIR=%CARBON_HOME%\tmp
 cd "%TMP_DIR%"
 del *.* /s /q > nul
diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat
index aa69a55c..2b9d17ed 100644
--- a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat
+++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat
@@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ----------------------------
 cd %CARBON_HOME%
 
 rem ------------------ Remove tmp folder on startup -----------------------------
+IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work
 set TMP_DIR=%CARBON_HOME%\tmp
 cd "%TMP_DIR%"
 del *.* /s /q > nul
diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat
index f3d31b35..f24565a0 100644
--- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat
+++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat
@@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ----------------------------
 cd %CARBON_HOME%
 
 rem ------------------ Remove tmp folder on startup -----------------------------
+IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work
 set TMP_DIR=%CARBON_HOME%\tmp
 cd "%TMP_DIR%"
 del *.* /s /q > nul
diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat
index 3fcfc3fa..c8b8fa80 100644
--- a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat
+++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat
@@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ----------------------------
 cd %CARBON_HOME%
 
 rem ------------------ Remove tmp folder on startup -----------------------------
+IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work
 set TMP_DIR=%CARBON_HOME%\tmp
 cd "%TMP_DIR%"
 del *.* /s /q > nul