diff --git a/app/templates/server/config/environment/index.js b/app/templates/server/config/environment/index.js
index fa98bbe03..0b787e8cd 100644
--- a/app/templates/server/config/environment/index.js
+++ b/app/templates/server/config/environment/index.js
@@ -64,4 +64,4 @@ var all = {
 // ==============================================
 module.exports = _.merge(
   all,
-  require('./' + process.env.NODE_ENV + '.js') || {});
+  all.env ? require('./' + all.env + '.js') : {});