diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 2fcef6bc7..f050c4bae 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -3171,13 +3171,15 @@ static void p2p_sd_cb(struct p2p_data *p2p, int success)
 		if (p2p->sd_peer)
 			p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
 		p2p->sd_peer = NULL;
-		p2p_continue_find(p2p);
+		if (p2p->state != P2P_IDLE)
+			p2p_continue_find(p2p);
 		return;
 	}
 
 	if (p2p->sd_peer == NULL) {
 		p2p_dbg(p2p, "No SD peer entry known");
-		p2p_continue_find(p2p);
+		if (p2p->state != P2P_IDLE)
+			p2p_continue_find(p2p);
 		return;
 	}