diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index 7ccc108d37..c9e1286aad 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -243,7 +243,7 @@ void AsyncWrap::EmitAfter(Environment* env, double async_id) {
 class PromiseWrap : public AsyncWrap {
  public:
   PromiseWrap(Environment* env, Local<Object> object, bool silent)
-    : AsyncWrap(env, object, PROVIDER_PROMISE, silent) {
+      : AsyncWrap(env, object, silent) {
     MakeWeak(this);
   }
   size_t self_size() const override { return sizeof(*this); }
@@ -573,8 +573,7 @@ void LoadAsyncWrapperInfo(Environment* env) {
 
 AsyncWrap::AsyncWrap(Environment* env,
                      Local<Object> object,
-                     ProviderType provider,
-                     bool silent)
+                     ProviderType provider)
     : BaseObject(env, object),
       provider_type_(provider) {
   CHECK_NE(provider, PROVIDER_NONE);
@@ -583,6 +582,22 @@ AsyncWrap::AsyncWrap(Environment* env,
   // Shift provider value over to prevent id collision.
   persistent().SetWrapperClassId(NODE_ASYNC_ID_OFFSET + provider);
 
+  // Use AsyncReset() call to execute the init() callbacks.
+  AsyncReset();
+}
+
+
+// This is specifically used by the PromiseWrap constructor.
+AsyncWrap::AsyncWrap(Environment* env,
+                     Local<Object> object,
+                     bool silent)
+    : BaseObject(env, object),
+      provider_type_(PROVIDER_PROMISE) {
+  CHECK_GE(object->InternalFieldCount(), 1);
+
+  // Shift provider value over to prevent id collision.
+  persistent().SetWrapperClassId(NODE_ASYNC_ID_OFFSET + provider_type_);
+
   // Use AsyncReset() call to execute the init() callbacks.
   AsyncReset(silent);
 }
diff --git a/src/async-wrap.h b/src/async-wrap.h
index e860afb905..0e0415da17 100644
--- a/src/async-wrap.h
+++ b/src/async-wrap.h
@@ -94,8 +94,7 @@ class AsyncWrap : public BaseObject {
 
   AsyncWrap(Environment* env,
             v8::Local<v8::Object> object,
-            ProviderType provider,
-            bool silent = false);
+            ProviderType provider);
 
   virtual ~AsyncWrap();
 
@@ -150,6 +149,10 @@ class AsyncWrap : public BaseObject {
   virtual size_t self_size() const = 0;
 
  private:
+  friend class PromiseWrap;
+
+  // This is specifically used by the PromiseWrap constructor.
+  AsyncWrap(Environment* env, v8::Local<v8::Object> promise, bool silent);
   inline AsyncWrap();
   const ProviderType provider_type_;
   // Because the values may be Reset(), cannot be made const.