diff --git a/nimble/controller/src/ble_ll_supp_cmd.c b/nimble/controller/src/ble_ll_supp_cmd.c
index 1c408fbff..a0493a46a 100644
--- a/nimble/controller/src/ble_ll_supp_cmd.c
+++ b/nimble/controller/src/ble_ll_supp_cmd.c
@@ -480,16 +480,33 @@
 )
 
 /* Octet 40 */
-#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV) && MYNEWT_VAL(BLE_VERSION) >= 51 && \
-    MYNEWT_VAL(BLE_LL_ROLE_OBSERVER)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV) && MYNEWT_VAL(BLE_VERSION) >= 51
+#if MYNEWT_VAL(BLE_LL_ROLE_OBSERVER)
 #define BLE_SUPP_CMD_LE_PADV_RECV_ENABLE (1 << 5)
 #else
 #define BLE_SUPP_CMD_LE_PADV_RECV_ENABLE (0 << 5)
 #endif
+
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+#if MYNEWT_VAL(BLE_LL_ROLE_OBSERVER)
 #define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (1 << 6)
+#else
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (0 << 6)
+#endif
+
+#if MYNEWT_VAL(BLE_LL_ROLE_BROADCASTER)
 #define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (1 << 7)
 #else
+#define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (0 << 7)
+#endif
+
+#else
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (0 << 6)
+#define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (0 << 7)
+#endif
+
+#else
+#define BLE_SUPP_CMD_LE_PADV_RECV_ENABLE (0 << 5)
 #define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (0 << 6)
 #define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (0 << 7)
 #endif