diff --git a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt
index 8ef20f89085c7..f9c6307394e89 100644
--- a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt
@@ -64,6 +64,9 @@ class KeyguardMediaController @Inject constructor(
         // Let's now initialize this view, which also creates the host view for us.
         mediaHost.init(MediaHierarchyManager.LOCATION_LOCKSCREEN)
         mediaView.setContentView(mediaHost.hostView)
+
+        // Ensure the visibility is correct
+        updateVisibility()
     }
 
     private fun updateVisibility() {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt
index 008dc12bba03a..730c941cc4140 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt
@@ -36,6 +36,7 @@ import org.mockito.ArgumentCaptor
 import org.mockito.Captor
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.mockito.Mockito.atLeastOnce
 import org.mockito.Mockito.verify
 import org.mockito.junit.MockitoJUnit
 
@@ -70,7 +71,7 @@ class KeyguardMediaControllerTest : SysuiTestCase() {
         `when`(mediaHost.visible).thenReturn(false)
         triggerVisibilityListener()
 
-        verify(mediaHeaderView).visibility = eq(GONE)
+        verify(mediaHeaderView, atLeastOnce()).visibility = eq(GONE)
     }
     @Test
     fun testAttach_visibleOnKeyguard() {
@@ -80,7 +81,7 @@ class KeyguardMediaControllerTest : SysuiTestCase() {
                 .thenReturn(true)
         triggerVisibilityListener()
 
-        verify(mediaHeaderView).visibility = eq(VISIBLE)
+        verify(mediaHeaderView, atLeastOnce()).visibility = eq(VISIBLE)
     }
     @Test
     fun testAttach_hiddenOnKeyguard_whenNotificationsAreHidden() {
@@ -90,7 +91,7 @@ class KeyguardMediaControllerTest : SysuiTestCase() {
                 .thenReturn(false)
         triggerVisibilityListener()
 
-        verify(mediaHeaderView).visibility = eq(GONE)
+        verify(mediaHeaderView, atLeastOnce()).visibility = eq(GONE)
     }
 
     private fun triggerVisibilityListener() {