diff --git a/adapter_ninafw.go b/adapter_ninafw.go
index 9fc21c01..3c714a92 100644
--- a/adapter_ninafw.go
+++ b/adapter_ninafw.go
@@ -92,6 +92,15 @@ func (a *Adapter) Enable() error {
 	return nil
 }
 
+func (a *Adapter) SetRandomAddress(mac MAC) error {
+	if err := a.hci.sendCommandWithParams(ogfLECtrl<<ogfCommandPos|ocfLESetRandomAddress, mac[:]); err != nil {
+		return err
+	}
+	copy(a.hci.address.MAC[:], mac[:])
+	a.hci.address.SetRandom(true)
+	return nil
+}
+
 func (a *Adapter) Address() (MACAddress, error) {
 	if err := a.hci.readBdAddr(); err != nil {
 		return MACAddress{}, err
diff --git a/gap_ninafw.go b/gap_ninafw.go
index a964eaac..e17f0997 100644
--- a/gap_ninafw.go
+++ b/gap_ninafw.go
@@ -140,13 +140,17 @@ func (a *Adapter) Connect(address Address, params ConnectionParams) (Device, err
 		println("Connect")
 	}
 
-	random := uint8(0)
+	peerRandom := uint8(0)
 	if address.isRandom {
-		random = 1
+		peerRandom = 1
+	}
+	localRandom := uint8(0)
+	if a.hci.address.isRandom {
+		localRandom = 1
 	}
 	if err := a.hci.leCreateConn(0x0060, 0x0030, 0x00,
-		random, makeNINAAddress(address.MAC),
-		0x00, 0x0006, 0x000c, 0x0000, 0x00c8, 0x0004, 0x0006); err != nil {
+		peerRandom, makeNINAAddress(address.MAC),
+		localRandom, 0x0006, 0x000c, 0x0000, 0x00c8, 0x0004, 0x0006); err != nil {
 		return Device{}, err
 	}