diff --git a/Composer/packages/server/src/store/data.template.ts b/Composer/packages/server/src/store/data.template.ts
index 93e3bdc22d..49b1b59b86 100644
--- a/Composer/packages/server/src/store/data.template.ts
+++ b/Composer/packages/server/src/store/data.template.ts
@@ -7,6 +7,9 @@ import fs from 'fs';
 import { Path } from '../utility/path';
 
 let defaultPath = process.env.DEFAULT_PATH;
+if (defaultPath && defaultPath.endsWith(':')) {
+  defaultPath = defaultPath + '/';
+}
 if (!defaultPath) {
   console.log(`The default path is set to ${Path.join(os.homedir(), 'Documents', 'Composer')}`);
   defaultPath = Path.join(os.homedir(), 'Documents', 'Composer');