diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 0042a7f9..cc0a77cf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -271,7 +271,10 @@ class MainActivity : SimpleActivity() {
                 conversations_list.adapter = this
             }
 
-            conversations_list.scheduleLayoutAnimation()
+            if (areSystemAnimationsEnabled) {
+                conversations_list.scheduleLayoutAnimation()
+            }
+
             conversations_fastscroller.setViews(conversations_list) {
                 val listItem = (conversations_list.adapter as? ConversationsAdapter)?.conversations?.getOrNull(it)
                 conversations_fastscroller.updateBubbleText(listItem?.title ?: "")
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index 53ffbcee..5bbfd332 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -160,7 +160,9 @@ class NewConversationActivity : SimpleActivity() {
                 contacts_list.adapter = this
             }
 
-            contacts_list.scheduleLayoutAnimation()
+            if (areSystemAnimationsEnabled) {
+                contacts_list.scheduleLayoutAnimation()
+            }
         } else {
             (currAdapter as ContactsAdapter).updateContacts(contacts)
         }