diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 9b86eb5e8..26b5a20a9 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -805,29 +805,23 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
                     }
                     break;
                 case KEELOQ_LEARNING_MAGIC_SERIAL_TYPE_2:
-                    if(mf_not_set) {
-                        man = subghz_protocol_keeloq_common_magic_serial_type2_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
+                    man = subghz_protocol_keeloq_common_magic_serial_type2_learning(
+                        fix, manufacture_code->key);
+                    decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
+                    if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
+                        *manufacture_name = furi_string_get_cstr(manufacture_code->name);
+                        mfname = *manufacture_name;
+                        return 1;
                     }
                     break;
                 case KEELOQ_LEARNING_MAGIC_SERIAL_TYPE_3:
-                    if(mf_not_set) {
-                        man = subghz_protocol_keeloq_common_magic_serial_type3_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
+                    man = subghz_protocol_keeloq_common_magic_serial_type3_learning(
+                        fix, manufacture_code->key);
+                    decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
+                    if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
+                        *manufacture_name = furi_string_get_cstr(manufacture_code->name);
+                        mfname = *manufacture_name;
+                        return 1;
                     }
                     break;
                 case KEELOQ_LEARNING_UNKNOWN:
diff --git a/lib/subghz/protocols/star_line.c b/lib/subghz/protocols/star_line.c
index 83a4846cd..362e34f3c 100644
--- a/lib/subghz/protocols/star_line.c
+++ b/lib/subghz/protocols/star_line.c
@@ -534,7 +534,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
     }
     for
         M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
-            if(mf_not_set || strcmp(furi_string_get_cstr(manufacture_code->name), mfname)) {
+            if(mf_not_set || (strcmp(furi_string_get_cstr(manufacture_code->name), mfname) == 0)) {
                 switch(manufacture_code->type) {
                 case KEELOQ_LEARNING_SIMPLE:
                     // Simple Learning