diff --git a/gruntfile.js b/gruntfile.js
index 1407195a..efa55746 100755
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -161,6 +161,8 @@ module.exports = function(grunt) {
 	    	}
 	    },
 		env: {
+			src: '.env',
+
 			test: {
 				NODE_ENV: 'test',
 			},
diff --git a/server.js b/server.js
index 8a2ec5ab..08aa0165 100755
--- a/server.js
+++ b/server.js
@@ -3,13 +3,6 @@
  * Module dependencies.
  */
 
-//Load ENV vars from .env
-var old_NODE_ENV = process.env.NODE_ENV;
-require('dotenv').config();
-
-if(!old_NODE_ENV){
-	process.env.NODE_ENV = old_NODE_ENV;
-}
 
 require('events').EventEmitter.prototype._maxListeners = 0;