diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
index ca6279bc6..7b30af6dd 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
@@ -27,11 +27,12 @@ interface Avatar {
 
     val hasClass: Boolean
         get() {
-            return preferences?.disableClasses != true && flags?.classSelected == true && stats?.habitClass?.isNotEmpty() == true
+            return preferences?.disableClasses != true && flags?.classSelected ?: true == true && stats?.habitClass?.isNotEmpty() == true
         }
 
     val currentMount: String?
         get() = items?.currentMount ?: ""
+
     val currentPet: String?
         get() = items?.currentPet ?: ""