diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 45b4bfed1..ffa6887b5 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -683,7 +683,7 @@ static void *audio_receiver_thread(void *arg)
                                         dec_state = (struct audio_decoder *) calloc(1, sizeof(struct audio_decoder));
 
                                         if (get_commandline_param("low-latency-audio")) {
-                                                pbuf_set_playout_delay(cp->playout_buffer, 0.005);
+                                                pbuf_set_playout_delay(cp->playout_buffer, strcmp(get_commandline_param("low-latency-audio"), "ultra") == 0 ? 0.001 :0.005);
                                         }
                                         assert(dec_state != NULL);
                                         cp->decoder_state = dec_state;
diff --git a/src/host.cpp b/src/host.cpp
index 0b4e9f124..2fe86905d 100644
--- a/src/host.cpp
+++ b/src/host.cpp
@@ -541,8 +541,9 @@ ADD_TO_PARAM("audio-cap-frames", "* audio-cap-frames=<f>\n"
                 "  Sets number of audio frames captured at once (CoreAudio)\n");
 ADD_TO_PARAM("audio-disable-adaptive-buffer", "* audio-disable-adaptive-buffer\n"
                 "  Disables audio adaptive playback buffer (CoreAudio/JACK)\n");
-ADD_TO_PARAM("low-latency-audio", "* low-latency-audio\n"
-                "  Try to reduce audio latency at the expense of worse reliability\n");
+ADD_TO_PARAM("low-latency-audio", "* low-latency-audio[=ultra]\n"
+                "  Try to reduce audio latency at the expense of worse reliability\n"
+                "  Add ultra for even more aggressive setting.\n");
 ADD_TO_PARAM("window-title", "* window-title=<title>\n"
                 "  Use alternative window title (SDL/GL only)\n");