diff --git a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/TerminalPipe.java b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/TerminalPipe.java
index ccfc905a3e3d..1e60f5b1ce4f 100644
--- a/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/TerminalPipe.java
+++ b/platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/util/log/TerminalPipe.java
@@ -34,10 +34,16 @@ public abstract class TerminalPipe extends LogPipeBase {
 
   @Override
   public void open() {
-    myTerminalListener = myLoggingHandler.createTerminal(myLogPipeName, getOutputStream(), getInputStream(), getStderr());
+    myTerminalListener =
+      myLoggingHandler.createTerminal(myLogPipeName, getOutputStream(), getInputStream(), getStderr());
     if (myTerminalListener == null) {
       myTerminalListener = TerminalListener.NULL;
     }
+    myTerminalListener.setTtyResizeHandler(getTtyResizeHandler());
+  }
+
+  protected TerminalListener.TtyResizeHandler getTtyResizeHandler() {
+    return null;
   }
 
   protected InputStream getStderr() {
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java
index c27e71d90d16..aaeee7fec8db 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java
@@ -106,7 +106,7 @@ public class CloudLoggingHandlerImpl implements CloudAgentLoggingHandler {
       }
 
       @Override
-      public void setTtyResizeHandler(TtyResizeHandler ttyResizeHandler) {
+      public void setTtyResizeHandler(@Nullable TtyResizeHandler ttyResizeHandler) {
         if (terminalHandler instanceof TerminalHandlerBase && ttyResizeHandler != null) {
           ((TerminalHandlerBase)terminalHandler).setResizeHandler(size -> ttyResizeHandler.onTtyResizeRequest(size.width, size.height));
         }