diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
index 30d5bc68..209eab65 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
@@ -67,11 +67,10 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
         override fun onClick(dialog: DialogInterface?, which: Int) {
             when (which) {
                 DialogInterface.BUTTON_POSITIVE -> {
+                    val newNickname = this@NicknameDialogFragment.dialog!!.findViewById<EditText>(android.R.id.edit).text
                     MacLookup.abort(arg.mac)
                     GlobalScope.launch(Dispatchers.Unconfined) {
-                        AppDatabase.instance.clientRecordDao.upsert(arg.mac) {
-                            nickname = this@NicknameDialogFragment.dialog!!.findViewById<EditText>(android.R.id.edit).text
-                        }
+                        AppDatabase.instance.clientRecordDao.upsert(arg.mac) { nickname = newNickname }
                     }
                 }
                 DialogInterface.BUTTON_NEUTRAL -> MacLookup.perform(arg.mac, true)