diff --git a/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt b/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
index 56ce7b8..dd4ff10 100644
--- a/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
+++ b/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
@@ -31,7 +31,6 @@
 import androidx.test.screenshot.AndroidXScreenshotTestRule
 import androidx.test.screenshot.assertAgainstGolden
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -95,7 +94,6 @@
         dumpAndAssertAgainstGolden("multiple_draw")
     }
 
-    @Ignore // b/271085711
     @Test
     fun testClear() {
         setAndWait(GRINNING_FACE)
diff --git a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
index 22a477c..c242938 100644
--- a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
+++ b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
@@ -92,8 +92,8 @@
     var emoji: CharSequence? = null
         set(value) {
             field = value
-            if (value != null) {
-                post {
+            post {
+                if (value != null) {
                     if (value == this.emoji) {
                         drawEmoji(
                             if (EmojiPickerView.emojiCompatLoaded)
@@ -104,9 +104,9 @@
                         contentDescription = value
                     }
                     invalidate()
+                } else {
+                    offscreenCanvasBitmap.eraseColor(Color.TRANSPARENT)
                 }
-            } else {
-                offscreenCanvasBitmap.eraseColor(Color.TRANSPARENT)
             }
         }