diff --git a/src/p2p.c b/src/p2p.c
index 34ff94bf..6c36d5b0 100644
--- a/src/p2p.c
+++ b/src/p2p.c
@@ -1300,6 +1300,13 @@ static void p2p_provision_scan_start(struct p2p_device *dev)
 						&params.extra_ie_size);
 	L_WARN_ON(!params.extra_ie);
 
+	/*
+	 * Rather than create the new interface and create a new
+	 * scan_context on it, use the P2P-Device interface and set
+	 * params.source_mac to our future P2P-Client address.
+	 */
+	params.source_mac = dev->conn_addr;
+
 	/*
 	 * Initially scan just the Operating Channel the GO reported
 	 * during the negotiation.  In theory there's no guarantee that