diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d1177cafc..694982e4f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,7 @@ This release fixes the following regressions identified in 4.1.0:
   Since ``LC_MESSAGES`` is not exported, it will not affect fish's child processes.
 
 - Some :doc:`fish_config <cmds/fish_config>` subcommands for prompts and themes were broken in standalone Linux builds (those using the ``embed-data`` cargo feature), which has been fixed (:issue:`11832`).
+- On Windows Terminal, we observed an issue where fish would fail to read a response to startup queries, causing brief hangs and a misleading error message. A workaround has been added (:issue:`11841`). 
 - Our new workaround for WezTerm's `issues with modifyOtherKeys <https://github.com/wezterm/wezterm/issues/6087>`__ breaking shifted keys was broken on some versions of WezTerm, which has been fixed (:issue:`11204`).
 - Fixed a crash in :doc:`the web-based configuration tool <cmds/fish_config>` when using the new underline styles (:issue:`11840`).
 
diff --git a/src/input_common.rs b/src/input_common.rs
index fbe8e0efb..989a4cccc 100644
--- a/src/input_common.rs
+++ b/src/input_common.rs
@@ -984,7 +984,10 @@ fn try_readb(&mut self, buffer: &mut Vec<u8>) -> Option<u8> {
         if !check_fd_readable(
             fd,
             Duration::from_millis(
-                if self.paste_is_buffering() || get_kitty_keyboard_capability() == Some(&true) {
+                if self.paste_is_buffering()
+                    || self.is_blocked_querying()
+                    || get_kitty_keyboard_capability() == Some(&true)
+                {
                     300
                 } else {
                     1