diff --git a/core/src/main/java/io/grpc/internal/AbstractServerStream.java b/core/src/main/java/io/grpc/internal/AbstractServerStream.java
index 33629f6a8a..4ce9aae1d3 100644
--- a/core/src/main/java/io/grpc/internal/AbstractServerStream.java
+++ b/core/src/main/java/io/grpc/internal/AbstractServerStream.java
@@ -169,6 +169,11 @@ public abstract class AbstractServerStream extends AbstractStream2
     return Attributes.EMPTY;
   }
 
+  @Override
+  public final void setListener(ServerStreamListener serverStreamListener) {
+    transportState().setListener(serverStreamListener);
+  }
+
   @Override
   public StatsTraceContext statsTraceContext() {
     return statsTraceCtx;
diff --git a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java
index 66bf5e6f7a..e451b1a8c2 100644
--- a/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java
+++ b/core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java
@@ -265,11 +265,6 @@ public class AbstractServerStreamTest {
       return state;
     }
 
-    @Override
-    public void setListener(ServerStreamListener serverStreamListener) {
-      state.setListener(serverStreamListener);
-    }
-
     static class TransportState extends AbstractServerStream.TransportState {
       protected TransportState(int maxMessageSize) {
         super(maxMessageSize, StatsTraceContext.NOOP);
diff --git a/netty/src/main/java/io/grpc/netty/NettyServerStream.java b/netty/src/main/java/io/grpc/netty/NettyServerStream.java
index bbbc3ed4a8..f35dbb4729 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServerStream.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServerStream.java
@@ -37,7 +37,6 @@ import io.grpc.Attributes;
 import io.grpc.Metadata;
 import io.grpc.Status;
 import io.grpc.internal.AbstractServerStream;
-import io.grpc.internal.ServerStreamListener;
 import io.grpc.internal.StatsTraceContext;
 import io.grpc.internal.WritableBuffer;
 import io.netty.buffer.ByteBuf;
@@ -87,11 +86,6 @@ class NettyServerStream extends AbstractServerStream {
     return attributes;
   }
 
-  @Override
-  public void setListener(ServerStreamListener serverStreamListener) {
-    state.setListener(serverStreamListener);
-  }
-
   private class Sink implements AbstractServerStream.Sink {
     @Override
     public void request(final int numMessages) {