diff --git a/src/ParseServer.js b/src/ParseServer.js
index e835a25146..6db13cffbe 100644
--- a/src/ParseServer.js
+++ b/src/ParseServer.js
@@ -1,7 +1,5 @@
 // ParseServer - open-source compatible API Server for Parse apps
 
-import 'babel-polyfill';
-
 var batch = require('./batch'),
     bodyParser = require('body-parser'),
     DatabaseAdapter = require('./DatabaseAdapter'),
@@ -11,6 +9,10 @@ var batch = require('./batch'),
     Parse = require('parse/node').Parse,
     path = require('path'),
     authDataManager = require('./authDataManager');
+    
+if (!global._babelPolyfill) {
+  require('babel-polyfill');
+}
 
 import { logger,
       configureLogger }       from './logger';