diff --git a/streams_map.go b/streams_map.go
index bf9374b4..ea55c63d 100644
--- a/streams_map.go
+++ b/streams_map.go
@@ -128,15 +128,13 @@ func (m *streamsMap) openRemoteStream(id protocol.StreamID) (streamI, error) {
 		m.highestStreamOpenedByPeer = id
 	}
 	s := m.newStream(id)
-	m.putStream(s)
-	return s, nil
+	return s, m.putStream(s)
 }
 
 func (m *streamsMap) openStreamImpl() (streamI, error) {
 	s := m.newStream(m.nextStreamToOpen)
-	m.putStream(s)
 	m.nextStreamToOpen = m.nextStreamID(m.nextStreamToOpen)
-	return s, nil
+	return s, m.putStream(s)
 }
 
 // OpenStream opens the next available stream
diff --git a/streams_map_legacy.go b/streams_map_legacy.go
index de52a8f6..e74fa31d 100644
--- a/streams_map_legacy.go
+++ b/streams_map_legacy.go
@@ -138,8 +138,7 @@ func (m *streamsMapLegacy) openRemoteStream(id protocol.StreamID) (streamI, erro
 	}
 
 	s := m.newStream(id)
-	m.putStream(s)
-	return s, nil
+	return s, m.putStream(s)
 }
 
 func (m *streamsMapLegacy) openStreamImpl() (streamI, error) {
@@ -149,9 +148,8 @@ func (m *streamsMapLegacy) openStreamImpl() (streamI, error) {
 
 	m.numOutgoingStreams++
 	s := m.newStream(m.nextStreamToOpen)
-	m.putStream(s)
 	m.nextStreamToOpen += 2
-	return s, nil
+	return s, m.putStream(s)
 }
 
 // OpenStream opens the next available stream