diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 33e3b3dee..68e3fdffd 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -1182,16 +1182,19 @@ void
 audio_register_aux_data(struct state_audio          *s,
                         struct additional_audio_data data)
 {
-        struct state_sdi_playback *sdi_playback;
-        if(!audio_playback_get_display_flags(s->audio_playback_device))
-                return;
-        
-        sdi_playback = (struct state_sdi_playback *) audio_playback_get_state_pointer(s->audio_playback_device);
-        sdi_register_display_callbacks(
-            sdi_playback, data.display_callbacks.udata,
-            (void (*)(void *, const struct audio_frame *)) data.display_callbacks.putf,
-            (bool (*)(void *, int, int, int)) data.display_callbacks.reconfigure,
-            (bool (*)(void *, int, void *, size_t *)) data.display_callbacks.get_property);
+        if (audio_playback_get_display_flags(s->audio_playback_device) != 0U) {
+                auto *sdi_playback = (struct state_sdi_playback *)
+                    audio_playback_get_state_pointer(s->audio_playback_device);
+                sdi_register_display_callbacks(
+                    sdi_playback, data.display_callbacks.udata,
+                    (void (*)(void *, const struct audio_frame *))
+                        data.display_callbacks.putf,
+                    (bool (*)(void *, int, int,
+                              int)) data.display_callbacks.reconfigure,
+                    (bool (*)(void *, int, void *,
+                              size_t *)) data.display_callbacks.get_property);
+        }
+
         s->vrxtx = data.vrxtx;
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index a1eb7328d..2f40b2729 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1479,14 +1479,12 @@ int main(int argc, char *argv[])
                         }
                 }
 
-                if(audio_get_display_flags(uv.audio)) {
-                        struct additional_audio_data aux = {
-                                { uv.display_device, display_put_audio_frame,
-                                 display_reconfigure_audio, display_ctl_property },
-                                uv.state_video_rxtx,
-                        };
-                        audio_register_aux_data(uv.audio, aux);
-                }
+                struct additional_audio_data aux = {
+                        { uv.display_device, display_put_audio_frame,
+                         display_reconfigure_audio, display_ctl_property },
+                        uv.state_video_rxtx,
+                };
+                audio_register_aux_data(uv.audio, aux);
 
                 if (opt.requested_capabilities != nullptr) {
                         print_capabilities(opt.requested_capabilities);