diff --git a/lib/utils/addEntries.js b/lib/utils/addEntries.js
index d74412c9fb..41062c2b5e 100644
--- a/lib/utils/addEntries.js
+++ b/lib/utils/addEntries.js
@@ -47,7 +47,9 @@ function addEntries (config, options, server) {
     };
 
     [].concat(config).forEach((config) => {
-      config.entry = prependEntry(config.entry || './src');
+      if (['node', 'async-node'].indexOf(config.target) === -1) {
+        config.entry = prependEntry(config.entry || './src');
+      }
     });
   }
 }
diff --git a/test/Entry.test.js b/test/Entry.test.js
index 6f6501ce60..244f176dea 100644
--- a/test/Entry.test.js
+++ b/test/Entry.test.js
@@ -174,4 +174,19 @@ describe('Entry', () => {
     );
     assert.equal(hotClientScript, require.resolve(hotClientScript));
   });
+
+  it('add node target', () => {
+    const webpackOptions = Object.assign({}, config, {
+      entry: {
+        foo: './foo.js'
+      },
+      node: true,
+      target: 'node'
+    });
+    const devServerOptions = {};
+
+    addEntries(webpackOptions, devServerOptions);
+
+    assert.equal(webpackOptions.entry.foo[0].indexOf('client/?'), -1);
+  });
 });