diff --git a/swarm/network/requests.go b/swarm/network/requests.go
index ffb9855266..bea5ff09de 100644
--- a/swarm/network/requests.go
+++ b/swarm/network/requests.go
@@ -58,16 +58,6 @@ type RetrieveRequestStreamer struct {
 	currentLen uint64
 }
 
-// RegisterRequestStreamer registers outgoing and incoming streamers for request handling
-func RegisterRequestStreamer(streamer *Streamer, db *DbAccess) {
-	streamer.RegisterOutgoingStreamer(retrieveRequestStream, func(_ *StreamerPeer, t []byte) (OutgoingStreamer, error) {
-		return NewRetrieveRequestStreamer(db), nil
-	})
-	streamer.RegisterIncomingStreamer(retrieveRequestStream, func(p *StreamerPeer, t []byte) (IncomingStreamer, error) {
-		return NewIncomingSwarmSyncer(p, db, nil)
-	})
-}
-
 // NewRetrieveRequestStreamer is RetrieveRequestStreamer constructor
 func NewRetrieveRequestStreamer(db *DbAccess) *RetrieveRequestStreamer {
 	s := &RetrieveRequestStreamer{
diff --git a/swarm/network/streamer.go b/swarm/network/streamer.go
index af9730a971..9c6abc8bed 100644
--- a/swarm/network/streamer.go
+++ b/swarm/network/streamer.go
@@ -147,6 +147,13 @@ func NewStreamer(overlay Overlay, dbAccess *DbAccess) *Streamer {
 		receiveC: make(chan *ChunkDeliveryMsg, 10),
 		peers:    make(map[discover.NodeID]*StreamerPeer),
 	}
+	streamer.RegisterOutgoingStreamer(retrieveRequestStream, func(_ *StreamerPeer, t []byte) (OutgoingStreamer, error) {
+		return NewRetrieveRequestStreamer(dbAccess), nil
+	})
+	streamer.RegisterIncomingStreamer(retrieveRequestStream, func(p *StreamerPeer, t []byte) (IncomingStreamer, error) {
+		return NewIncomingSwarmSyncer(p, dbAccess, nil)
+	})
+	return streamer
 }
 
 // RegisterIncomingStreamer registers an incoming streamer constructor