diff --git a/core/server/api/db.js b/core/server/api/db.js
index 55ee7a7d2f..bd614f4666 100644
--- a/core/server/api/db.js
+++ b/core/server/api/db.js
@@ -5,7 +5,7 @@ var dataExport       = require('../data/export'),
     dataProvider     = require('../models'),
     fs               = require('fs-extra'),
     when             = require('when'),
-    nodefn           = require('when/node/function'),
+    nodefn           = require('when/node'),
     _                = require('lodash'),
     validation       = require('../data/validation'),
     errors           = require('../../server/errors'),
diff --git a/core/server/data/migration/index.js b/core/server/data/migration/index.js
index f9c0e34311..eae2d510b0 100644
--- a/core/server/data/migration/index.js
+++ b/core/server/data/migration/index.js
@@ -2,7 +2,7 @@ var _               = require('lodash'),
     when            = require('when'),
     path            = require('path'),
     fs              = require('fs'),
-    nodefn          = require('when/node/function'),
+    nodefn          = require('when/node'),
     errors          = require('../../errors'),
     client          = require('../../models/base').client,
     knex            = require('../../models/base').knex,
diff --git a/core/server/mail.js b/core/server/mail.js
index c68df57867..ff66a69b55 100644
--- a/core/server/mail.js
+++ b/core/server/mail.js
@@ -1,7 +1,7 @@
 var cp         = require('child_process'),
     _          = require('lodash'),
     when       = require('when'),
-    nodefn     = require('when/node/function'),
+    nodefn     = require('when/node'),
     nodemailer = require('nodemailer'),
     config     = require('./config');
 
diff --git a/core/server/models/user.js b/core/server/models/user.js
index af7fc3351c..3d795ea739 100644
--- a/core/server/models/user.js
+++ b/core/server/models/user.js
@@ -1,7 +1,7 @@
 var _              = require('lodash'),
     when           = require('when'),
     errors         = require('../errors'),
-    nodefn         = require('when/node/function'),
+    nodefn         = require('when/node'),
     bcrypt         = require('bcryptjs'),
     Posts          = require('./post').Posts,
     ghostBookshelf = require('./base'),
diff --git a/core/server/storage/localfilesystem.js b/core/server/storage/localfilesystem.js
index d6de2e14de..e694dbf3bb 100644
--- a/core/server/storage/localfilesystem.js
+++ b/core/server/storage/localfilesystem.js
@@ -4,7 +4,7 @@
 var _       = require('lodash'),
     express = require('express'),
     fs      = require('fs-extra'),
-    nodefn  = require('when/node/function'),
+    nodefn  = require('when/node'),
     path    = require('path'),
     when    = require('when'),
     errors  = require('../errors'),
diff --git a/core/server/update-check.js b/core/server/update-check.js
index b1a3818d0c..b76c747b62 100644
--- a/core/server/update-check.js
+++ b/core/server/update-check.js
@@ -24,7 +24,7 @@ var crypto   = require('crypto'),
     moment   = require('moment'),
     semver   = require('semver'),
     when     = require('when'),
-    nodefn   = require('when/node/function'),
+    nodefn   = require('when/node'),
     _        = require('lodash'),
     url      = require('url'),
 
diff --git a/core/test/utils/index.js b/core/test/utils/index.js
index 08d0d73fc1..a8c5b5fddc 100644
--- a/core/test/utils/index.js
+++ b/core/test/utils/index.js
@@ -1,7 +1,7 @@
 var knex          = require('../../server/models/base').knex,
     when          = require('when'),
     sequence      = require('when/sequence'),
-    nodefn        = require('when/node/function'),
+    nodefn        = require('when/node'),
     _             = require('lodash'),
     fs            = require('fs-extra'),
     path          = require('path'),
diff --git a/package.json b/package.json
index 5cb2fe1212..999c0655bd 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "static-favicon": "1.0.2",
         "unidecode": "0.1.3",
         "validator": "3.4.0",
-        "when": "2.7.0",
+        "when": "3.2.3",
         "xml": "0.0.12"
     },
     "optionalDependencies": {