diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 2e4b6eff6da..ef20c1054f3 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -319,8 +319,10 @@ class OnkyoDevice(MediaPlayerEntity):
         preset_raw = self.command("preset query")
         if self._audio_info_supported:
             audio_information_raw = self.command("audio-information query")
+            self._parse_audio_information(audio_information_raw)
         if self._video_info_supported:
             video_information_raw = self.command("video-information query")
+            self._parse_video_information(video_information_raw)
         if not (volume_raw and mute_raw and current_source_raw):
             return
 
@@ -343,9 +345,6 @@ class OnkyoDevice(MediaPlayerEntity):
             self._receiver_max_volume * self._max_volume / 100
         )
 
-        self._parse_audio_information(audio_information_raw)
-        self._parse_video_information(video_information_raw)
-
         if not hdmi_out_raw:
             return
         self._attributes[ATTR_VIDEO_OUT] = ",".join(hdmi_out_raw[1])