diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
index 053591b6db2..51463d911f3 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.jetty.http2.api.Session;
 import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
 import org.eclipse.jetty.util.Callback;
@@ -31,23 +30,25 @@ public class HTTP2Stream implements IStream
 {
     private final AtomicReference<ConcurrentMap<String, Object>> attributes = new AtomicReference<>();
     private final ISession session;
+    private final HeadersFrame frame;
     private Listener listener;
 
-    public HTTP2Stream(ISession session)
+    public HTTP2Stream(ISession session, HeadersFrame frame)
     {
         this.session = session;
+        this.frame = frame;
     }
 
     @Override
     public int getId()
     {
-        return 0;
+        return frame.getStreamId();
     }
 
     @Override
-    public Session getSession()
+    public ISession getSession()
     {
-        return null;
+        return session;
     }
 
     @Override
diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/IStream.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/IStream.java
index bc13bb9d268..47f7c802c2e 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/IStream.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/IStream.java
@@ -23,6 +23,9 @@ import org.eclipse.jetty.http2.frames.DataFrame;
 
 public interface IStream extends Stream
 {
+    @Override
+    public ISession getSession();
+
     public void setListener(Listener listener);
 
     public boolean process(DataFrame frame);
diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java
index 45939982ea7..3af38f10d7a 100644
--- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java
+++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java
@@ -60,7 +60,7 @@ public class HTTP2ServerSession extends HTTP2Session implements ServerParser.Lis
         // TODO: handle duplicate streams
         // TODO: handle empty headers
 
-        IStream stream = new HTTP2Stream(this);
+        IStream stream = new HTTP2Stream(this, frame);
         IStream existing = putIfAbsent(stream);
         if (existing == null)
         {