diff --git a/native_mate/constructor.h b/native_mate/constructor.h
index 1b6a23c14c..14ea119e56 100644
--- a/native_mate/constructor.h
+++ b/native_mate/constructor.h
@@ -176,7 +176,7 @@ class Constructor {
   }
 
   base::StringPiece name_;
-  v8::Persistent<v8::FunctionTemplate> constructor_;
+  v8::UniquePersistent<v8::FunctionTemplate> constructor_;
 
   DISALLOW_COPY_AND_ASSIGN(Constructor);
 };
diff --git a/native_mate/constructor.h.pump b/native_mate/constructor.h.pump
index 87d10bbc68..94a56d424a 100644
--- a/native_mate/constructor.h.pump
+++ b/native_mate/constructor.h.pump
@@ -112,7 +112,7 @@ class Constructor {
   }
 
   base::StringPiece name_;
-  v8::Persistent<v8::FunctionTemplate> constructor_;
+  v8::UniquePersistent<v8::FunctionTemplate> constructor_;
 
   DISALLOW_COPY_AND_ASSIGN(Constructor);
 };
diff --git a/native_mate/function_template.h b/native_mate/function_template.h
index 54b71c04f8..14ed170080 100644
--- a/native_mate/function_template.h
+++ b/native_mate/function_template.h
@@ -57,7 +57,7 @@ class CallbackHolderBase {
  private:
   static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase);
 
-  v8::Persistent<v8::External> v8_ref_;
+  v8::UniquePersistent<v8::External> v8_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase);
 };
diff --git a/native_mate/function_template.h.pump b/native_mate/function_template.h.pump
index ddfe29a25d..c3009f2a82 100644
--- a/native_mate/function_template.h.pump
+++ b/native_mate/function_template.h.pump
@@ -60,7 +60,7 @@ class CallbackHolderBase {
  private:
   static MATE_WEAK_CALLBACK(WeakCallback, v8::External, CallbackHolderBase);
 
-  v8::Persistent<v8::External> v8_ref_;
+  v8::UniquePersistent<v8::External> v8_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackHolderBase);
 };
diff --git a/native_mate/wrappable.cc b/native_mate/wrappable.cc
index 4596d154bd..070c3c59d9 100644
--- a/native_mate/wrappable.cc
+++ b/native_mate/wrappable.cc
@@ -46,7 +46,6 @@ ObjectTemplateBuilder Wrappable::GetObjectTemplateBuilder(
 // static
 MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) {
   MATE_WEAK_CALLBACK_INIT(Wrappable);
-  MATE_PERSISTENT_RESET(self->wrapper_);
   delete self;
 }
 
diff --git a/native_mate/wrappable.h b/native_mate/wrappable.h
index 6031674c06..f93bf6b3b2 100644
--- a/native_mate/wrappable.h
+++ b/native_mate/wrappable.h
@@ -74,7 +74,7 @@ class Wrappable {
  private:
   static MATE_WEAK_CALLBACK(WeakCallback, v8::Object, Wrappable);
 
-  v8::Persistent<v8::Object> wrapper_;  // Weak
+  v8::UniquePersistent<v8::Object> wrapper_;  // Weak
 
   DISALLOW_COPY_AND_ASSIGN(Wrappable);
 };