diff --git a/tabby-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts
index 62b86366..b38dc5d0 100644
--- a/tabby-terminal/src/api/baseTerminalTab.component.ts
+++ b/tabby-terminal/src/api/baseTerminalTab.component.ts
@@ -130,7 +130,13 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     private sessionSupportsBracketedPaste = false
     private spinner = new Spinner({
         stream: {
-            write: x => this.writeRaw(x),
+            write: x => {
+                try {
+                    this.writeRaw(x)
+                } catch {
+                    this.spinner.stop()
+                }
+            },
         },
     })
     private spinnerActive = false