diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index a7946786c514..72443bdb815a 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -485,17 +485,7 @@ void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
 }
 
 void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
-  int process_id = render_view_host->GetProcess()->GetID();
-  Emit("render-view-deleted", process_id);
-
-  // process.emit('ATOM_BROWSER_RELEASE_RENDER_VIEW', processId);
-  // Tell the rpc server that a render view has been deleted and we need to
-  // release all objects owned by it.
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  node::Environment* env = node::Environment::GetCurrent(isolate());
-  mate::EmitEvent(isolate(), env->process_object(),
-                  "ATOM_BROWSER_RELEASE_RENDER_VIEW", process_id);
+  Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
 }
 
 void WebContents::RenderProcessGone(base::TerminationStatus status) {
diff --git a/atom/browser/lib/objects-registry.js b/atom/browser/lib/objects-registry.js
index 9677c7fea22d..c3f70c976ecb 100644
--- a/atom/browser/lib/objects-registry.js
+++ b/atom/browser/lib/objects-registry.js
@@ -17,14 +17,20 @@ class ObjectsRegistry {
 
   // Register a new object and return its assigned ID. If the object is already
   // registered then the already assigned ID would be returned.
-  add(webContentsId, obj) {
+  add(webContents, obj) {
     // Get or assign an ID to the object.
     let id = this.saveToStorage(obj);
 
     // Add object to the set of referenced objects.
+    let webContentsId = webContents.getId();
     let owner = this.owners[webContentsId];
-    if (!owner)
+    if (!owner) {
       owner = this.owners[webContentsId] = new Set();
+      // Clear the storage when webContents is reloaded/navigated.
+      webContents.once('render-view-deleted', (event, id) => {
+        this.clear(id);
+      });
+    }
     if (!owner.has(id)) {
       owner.add(id);
       // Increase reference count if not referenced before.
diff --git a/atom/browser/lib/rpc-server.js b/atom/browser/lib/rpc-server.js
index 7b59648eda13..20ee8fbdeae1 100644
--- a/atom/browser/lib/rpc-server.js
+++ b/atom/browser/lib/rpc-server.js
@@ -100,7 +100,7 @@ var valueToMeta = function(sender, value, optimizeSimpleObject) {
     // Reference the original value if it's an object, because when it's
     // passed to renderer we would assume the renderer keeps a reference of
     // it.
-    meta.id = objectsRegistry.add(sender.getId(), value);
+    meta.id = objectsRegistry.add(sender, value);
     meta.members = getObjectMemebers(value);
     meta.proto = getObjectPrototype(value);
   } else if (meta.type === 'buffer') {
@@ -239,11 +239,6 @@ var callFunction = function(event, func, caller, args) {
   }
 };
 
-// Send by BrowserWindow when its render view is deleted.
-process.on('ATOM_BROWSER_RELEASE_RENDER_VIEW', function(id) {
-  return objectsRegistry.clear(id);
-});
-
 ipcMain.on('ATOM_BROWSER_REQUIRE', function(event, module) {
   try {
     return event.returnValue = valueToMeta(event.sender, process.mainModule.require(module));