diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 06580a6b9..6ef25e4e2 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -47,5 +47,5 @@ object FeatureFlags {
     /**
      * Enables wait til first contentful paint
      */
-    val waitUntilPaintToDraw = Config.channel.isDebug
+    val waitUntilPaintToDraw = Config.channel.isNightlyOrDebug
 }