diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt
index a3fe96971..c750e30bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt
@@ -1,11 +1,17 @@
 package org.thoughtcrime.securesms.util
 
+import android.animation.ValueAnimator
 import android.content.ContentResolver
+import android.os.Build
 import android.provider.Settings
 
 fun ContentResolver.areSystemAnimationsDisabled(): Boolean {
-  val durationScale = Settings.System.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE)
-  val transitionScale = Settings.System.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE)
+  return if (Build.VERSION.SDK_INT >= 26) {
+    !ValueAnimator.areAnimatorsEnabled()
+  } else {
+    val durationScale = Settings.System.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE)
+    val transitionScale = Settings.System.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE)
 
-  return !(durationScale > 0f && transitionScale > 0f)
+    !(durationScale > 0f && transitionScale > 0f)
+  }
 }