diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 8fb6c78e1..1ab0b3682 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -71,6 +71,8 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         isInitialSelection = args.isInitialSelection
         currentClass = args.className
 
+        newClass = currentClass ?: "healer"
+
         compositeSubscription.add(userRepository.getUser().firstElement().subscribe({
             it.preferences?.let {preferences ->
                 val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
@@ -91,11 +93,6 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
     }
 
-    override fun onStart() {
-        super.onStart()
-        newClass = currentClass ?: "healer"
-    }
-
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.class_selection, menu)