diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java b/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java
index 5fb9cc438..acfa9dac3 100644
--- a/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java
+++ b/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java
@@ -236,6 +236,7 @@ private void run () {
             Log.debug("NonBlockingInputStream shutdown");
             synchronized (this) {
                 thread = null;
+                threadIsReading = false;
             }
         }
     }
diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java b/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java
index aca74996e..022be4cee 100644
--- a/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java
+++ b/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java
@@ -244,6 +244,7 @@ private void run () {
             Log.debug("NonBlockingReader shutdown");
             synchronized (this) {
                 thread = null;
+                threadIsReading = false;
             }
         }
     }