diff --git a/feeds/qca-wifi-7/hostapd/files/common.uc b/feeds/qca-wifi-7/hostapd/files/common.uc
index 31b526b6a..4aca3e0ec 100644
--- a/feeds/qca-wifi-7/hostapd/files/common.uc
+++ b/feeds/qca-wifi-7/hostapd/files/common.uc
@@ -259,8 +259,13 @@ const phy_proto = {
 			addr[0] ^= idx << 2;
 			break;
 		case "b5":
-			if (mbssid)
+			if (mbssid) {
+				let b5 = addr[5];
+				addr[5] = addr[3];
+				addr[3] = b5;
+				addr[5] &= ~0xf;
 				addr[0] |= 2;
+			}
 			addr[5] ^= idx;
 			break;
 		default: