diff --git a/applications/external/ble_spam/protocols/continuity.c b/applications/external/ble_spam/protocols/continuity.c
index 4b29683ab..5027414e3 100644
--- a/applications/external/ble_spam/protocols/continuity.c
+++ b/applications/external/ble_spam/protocols/continuity.c
@@ -91,7 +91,7 @@ static void continuity_make_packet(uint8_t* _size, uint8_t** _packet, const Prot
     const ContinuityCfg* cfg = _cfg ? &_cfg->continuity : NULL;
 
     ContinuityType type;
-    if(cfg) {
+    if(cfg && cfg->type != 0x00) {
         type = cfg->type;
     } else {
         const ContinuityType types[] = {
diff --git a/applications/external/ble_spam/protocols/easysetup.c b/applications/external/ble_spam/protocols/easysetup.c
index 98a9541de..b95cab031 100644
--- a/applications/external/ble_spam/protocols/easysetup.c
+++ b/applications/external/ble_spam/protocols/easysetup.c
@@ -81,7 +81,7 @@ void easysetup_make_packet(uint8_t* out_size, uint8_t** out_packet, const Protoc
     const EasysetupCfg* cfg = _cfg ? &_cfg->easysetup : NULL;
 
     EasysetupType type;
-    if(cfg) {
+    if(cfg && cfg->type != 0x00) {
         type = cfg->type;
     } else {
         type = rand() % EasysetupTypeCOUNT;
diff --git a/applications/external/ble_spam/protocols/easysetup.h b/applications/external/ble_spam/protocols/easysetup.h
index 4c9458538..010dc7ec2 100644
--- a/applications/external/ble_spam/protocols/easysetup.h
+++ b/applications/external/ble_spam/protocols/easysetup.h
@@ -5,7 +5,7 @@
 // Research by @Spooks4576
 
 typedef enum {
-    EasysetupTypeBuds,
+    EasysetupTypeBuds = 0x01, // Skip 0 as it means unset
     EasysetupTypeWatch,
     EasysetupTypeCOUNT,
 } EasysetupType;