diff --git a/bzz/netstore.go b/bzz/netstore.go
index ce570f7af8..52c2857274 100644
--- a/bzz/netstore.go
+++ b/bzz/netstore.go
@@ -142,11 +142,19 @@ func (self *NetStore) addRetrieveRequest(req *retrieveRequestMsgData) {
 	defer self.lock.Unlock()
 
 	chunk := self.get(req.Key)
+	if chunk.Data == nil {
+		chunk.req.status = reqSearching
+	} else {
+		chunk.req.status = reqFound
+	}
+
 	t := time.Now().Add(10 * time.Second)
 	req.timeout = &t
 
 	send, timeout := self.strategyUpdateRequest(chunk.req, req) // may change req status
 
+	dpaLogger.Debugf("Is %v == %v?", send, storeRequestMsg)
+
 	if send == storeRequestMsg {
 		self.deliver(req, chunk)
 	} else {
diff --git a/bzz/protocol.go b/bzz/protocol.go
index e6f9eb996e..c0f024071c 100644
--- a/bzz/protocol.go
+++ b/bzz/protocol.go
@@ -289,7 +289,7 @@ func (self *bzzProtocol) retrieve(req *retrieveRequestMsgData) {
 }
 
 func (self *bzzProtocol) store(req *storeRequestMsgData) {
-	p2p.EncodeMsg(self.rw, storeRequestMsg, req)
+	p2p.EncodeMsg(self.rw, storeRequestMsg, req.Key, req.Size, req.Data, req.Id)
 }
 
 func (self *bzzProtocol) peers(req *peersMsgData) {