diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
index 7349014474b..b8185f009bb 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
@@ -477,7 +477,12 @@ uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
 		return scan_rsp_set(adv, len, data);
 	}
 
-	/* TODO: */
+	/* FIXME: Workaround to not fail when no data is supplied */
+	if (!len) {
+		return 0;
+	}
+
+	/* TODO: Populate extended scan response data */
 
 	return BT_HCI_ERR_CMD_DISALLOWED;
 }