diff --git a/electron/main.js b/electron/main.js
index 635c078..130d5f4 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -138,8 +138,8 @@ function setupTerminalAPI(app) {
     res.write(`data: ${JSON.stringify({ type: 'connected' })}\n\n`);
 
     req.on('close', () => {
-      session.pty.offData(dataHandler);
-      session.pty.offExit(exitHandler);
+      session.pty.removeListener('data', dataHandler);
+      session.pty.removeListener('exit', exitHandler);
     });
   });
 
diff --git a/server/index.js b/server/index.js
index 7a94f58..05359dd 100644
--- a/server/index.js
+++ b/server/index.js
@@ -154,8 +154,8 @@ app.get('/api/terminal/:sessionId/stream', (req, res) => {
 
   // Handle client disconnect
   req.on('close', () => {
-    session.pty.offData(dataHandler);
-    session.pty.offExit(exitHandler);
+    session.pty.removeListener('data', dataHandler);
+    session.pty.removeListener('exit', exitHandler);
     console.log(`Client disconnected: session=${sessionId} client=${clientId}`);
   });
 });