diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
index d4c66e6ff..464828684 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
@@ -184,8 +184,7 @@ class AccountPreferenceFragment :
             }
 
             "APIToken" -> {
-                ApiTokenBottomSheetFragment(
-                    apiToken = hostConfig.apiKey).show(childFragmentManager, ApiTokenBottomSheetFragment.TAG)
+                ApiTokenBottomSheetFragment.newInstance(hostConfig.apiKey).show(childFragmentManager, ApiTokenBottomSheetFragment.TAG)
                 return true
             }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt
index 15a2bd82e..547e7377c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt
@@ -11,9 +11,15 @@ import com.habitrpg.android.habitica.ui.views.ApiTokenBottomSheet
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 
-class ApiTokenBottomSheetFragment(
-    private val apiToken: String
-) : BottomSheetDialogFragment() {
+class ApiTokenBottomSheetFragment : BottomSheetDialogFragment() {
+    private lateinit var apiToken: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        apiToken = arguments?.getString(ARG_API_TOKEN) ?: ""
+    }
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -33,6 +39,14 @@ class ApiTokenBottomSheetFragment(
     }
 
     companion object {
+        private const val ARG_API_TOKEN = "arg_api_token"
+        fun newInstance(apiToken: String): ApiTokenBottomSheetFragment =
+            ApiTokenBottomSheetFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_API_TOKEN, apiToken)
+                }
+            }
+
         const val TAG = "ApiTokenBottomSheet"
     }
 }