diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt
index 649fd9ed..bae40587 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt
@@ -62,10 +62,12 @@ class MessagesComposeChipCreator(
             Teacher.TYPE_EDUCATOR,
             Teacher.TYPE_STUDENT
         )
+
+        val adapter = nacho.adapter as? MessagesComposeSuggestionAdapter ?: return null
         val teachers = if (sortByCategory)
-            teacherList.sortedBy { it.typeDescription }
+            adapter.originalList.sortedBy { it.typeDescription }
         else
-            teacherList
+            adapter.originalList
 
         val category = mutableListOf<Teacher>()
         val categoryNames = mutableListOf<CharSequence>()