diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 2142c5f6..a6a061ce 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -457,7 +457,6 @@ class Shadowsocks
       case None =>                  // removed
         val profiles = ShadowsocksApplication.profileManager.getAllProfiles.getOrElse(List[Profile]())
         ShadowsocksApplication.profileId(if (profiles.isEmpty) -1 else profiles.head.id)
-        ShadowsocksApplication.currentProfile getOrElse currentProfile
     }
 
     updatePreferenceScreen()
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
index d507b88f..f63114e0 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
@@ -77,7 +77,10 @@ object ShadowsocksApplication {
     .build())
 
   def profileId = settings.getInt(Key.profileId, -1)
-  def profileId(i: Int) = settings.edit.putInt(Key.profileId, i).apply
+  def profileId(i: Int) = {
+    settings.edit.putInt(Key.profileId, i).apply
+    profileManager.load(i)
+  }
   def proxy = settings.getString(Key.proxy, "")
   def currentProfile = profileManager.getProfile(profileId)
 }