diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 84a6f6cdf..82fed7258 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -53,8 +53,9 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getSkills(user: User): Observable<RealmResults<Skill>> {
+        val habitClass = if (user.preferences.disableClasses) "none" else user.stats.habitClass
         return realm.where(Skill::class.java)
-                .equalTo("habitClass", user.stats.getHabitClass())
+                .equalTo("habitClass", habitClass)
                 .lessThanOrEqualTo("lvl", user.stats.lvl)
                 .findAll()
                 .asObservable()