diff --git a/gitstatus/bin/gitstatusd-linux-x86_64 b/gitstatus/bin/gitstatusd-linux-x86_64
index c5f9f360..4537545c 100755
Binary files a/gitstatus/bin/gitstatusd-linux-x86_64 and b/gitstatus/bin/gitstatusd-linux-x86_64 differ
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index 6a4e8db6..2bcb7b13 100644
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@@ -101,6 +101,8 @@ function gitstatus_query() {
     _gitstatus_process_response $name $timeout $req_id
     [[ $VCS_STATUS_RESULT == *-async ]] || break
   done
+
+  [[ $VCS_STATUS_RESULT != tout || -n $callback ]]
 }
 
 typeset -fH _gitstatus_process_response() {