diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index c46f0748e3b..2dfc3e056da 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -163,10 +163,7 @@ void App::OnQuit() {
   Emit("quit");
 
   if (process_singleton_.get()) {
-    if (process_notify_result_ == ProcessSingleton::PROCESS_NONE) {
-      process_singleton_->Cleanup();
-    }
-
+    process_singleton_->Cleanup();
     process_singleton_.reset();
   }
 }
@@ -196,9 +193,8 @@ void App::OnFinishLaunching() {
   auto handle = Session::CreateFrom(isolate(), browser_context);
   default_session_.Reset(isolate(), handle.ToV8());
 
-  if (process_singleton_.get()) {
+  if (process_singleton_startup_lock_.get())
     process_singleton_startup_lock_->Unlock();
-  }
 
   Emit("ready");
 }
@@ -282,35 +278,31 @@ v8::Local<v8::Value> App::DefaultSession(v8::Isolate* isolate) {
 }
 
 bool App::MakeSingleInstance(ProcessSingleton::NotificationCallback callback) {
-  base::FilePath userDir;
-  PathService::Get(brightray::DIR_USER_DATA, &userDir);
+  if (process_singleton_.get())
+    return false;
 
-  if (!process_singleton_.get()) {
-    auto browser = Browser::Get();
-    process_singleton_startup_lock_.reset(
+  base::FilePath user_dir;
+  PathService::Get(brightray::DIR_USER_DATA, &user_dir);
+
+  process_singleton_startup_lock_.reset(
       new ProcessSingletonStartupLock(callback));
-
-    process_singleton_.reset(
+  process_singleton_.reset(
       new ProcessSingleton(
-        userDir,
+        user_dir,
         process_singleton_startup_lock_->AsNotificationCallback()));
 
-    if (browser->is_ready()) {
-      process_singleton_startup_lock_->Unlock();
-    }
+  if (Browser::Get()->is_ready())
+    process_singleton_startup_lock_->Unlock();
 
-    process_notify_result_ = process_singleton_->NotifyOtherProcessOrCreate();
-  }
-
-  switch (process_notify_result_) {
+  switch (process_singleton_->NotifyOtherProcessOrCreate()) {
     case ProcessSingleton::NotifyResult::PROCESS_NONE:
       return false;
     case ProcessSingleton::NotifyResult::LOCK_ERROR:
     case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
     case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED:
+      process_singleton_.reset();
+      process_singleton_startup_lock_.reset();
       return true;
-    default:
-      return false;
   }
 }
 
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index 314eeea8811..8d55fc27c3b 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -80,7 +80,6 @@ class App : public mate::EventEmitter,
 
   scoped_ptr<ProcessSingleton> process_singleton_;
   scoped_ptr<ProcessSingletonStartupLock> process_singleton_startup_lock_;
-  ProcessSingleton::NotifyResult process_notify_result_;
 
   DISALLOW_COPY_AND_ASSIGN(App);
 };
diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc
index 5ab6eb6d8a7..4117dff8863 100644
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -1046,4 +1046,4 @@ void ProcessSingleton::KillProcess(int pid) {
   // progress of shutting down and finishes before we try to kill it).
   DCHECK(rv == 0 || errno == ESRCH) << "Error killing process: "
                                     << base::safe_strerror(errno);
-}
\ No newline at end of file
+}
diff --git a/chromium_src/chrome/browser/process_singleton_startup_lock.cc b/chromium_src/chrome/browser/process_singleton_startup_lock.cc
index b97ada658c3..f564de7dca4 100644
--- a/chromium_src/chrome/browser/process_singleton_startup_lock.cc
+++ b/chromium_src/chrome/browser/process_singleton_startup_lock.cc
@@ -50,4 +50,4 @@ bool ProcessSingletonStartupLock::NotificationCallbackImpl(
   } else {
     return original_callback_.Run(command_line, current_directory);
   }
-}
\ No newline at end of file
+}
diff --git a/chromium_src/chrome/browser/process_singleton_startup_lock.h b/chromium_src/chrome/browser/process_singleton_startup_lock.h
index 3df51d8b177..187dd35bce3 100644
--- a/chromium_src/chrome/browser/process_singleton_startup_lock.h
+++ b/chromium_src/chrome/browser/process_singleton_startup_lock.h
@@ -54,4 +54,4 @@ class ProcessSingletonStartupLock : public base::NonThreadSafe {
   DISALLOW_COPY_AND_ASSIGN(ProcessSingletonStartupLock);
 };
 
-#endif  // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
\ No newline at end of file
+#endif  // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_