diff --git a/compiled/README.md b/compiled/README.md
index f1dba4c..ec1b1c7 100644
--- a/compiled/README.md
+++ b/compiled/README.md
@@ -1,7 +1,7 @@
 # Types of Firmware:
 |firmware    |file name            |
 |------------|---------------------|
-|Momentum    |nrf24_jammer[M].fap  |
-|Unleashed   |nrf24_jammer[U].fap  |
-|RogueMaster |nrf24_jammer[R].fap  |
-|Official    |nrf24_jammer[OF].fap |
\ No newline at end of file
+|Momentum    |nrf24_jammer_M.fap   |
+|Unleashed   |nrf24_jammer_U.fap   |
+|RogueMaster |nrf24_jammer_R.fap   |
+|Official    |nrf24_jammer_OF.fap  |
\ No newline at end of file
diff --git a/compiled/nrf24_jammer[M].fap b/compiled/nrf24_jammer[M].fap
deleted file mode 100644
index 2e72ce0..0000000
Binary files a/compiled/nrf24_jammer[M].fap and /dev/null differ
diff --git a/compiled/nrf24_jammer[OF].fap b/compiled/nrf24_jammer[OF].fap
deleted file mode 100644
index 10a1622..0000000
Binary files a/compiled/nrf24_jammer[OF].fap and /dev/null differ
diff --git a/compiled/nrf24_jammer[R].fap b/compiled/nrf24_jammer[R].fap
deleted file mode 100644
index bc4edc5..0000000
Binary files a/compiled/nrf24_jammer[R].fap and /dev/null differ
diff --git a/compiled/nrf24_jammer[U].fap b/compiled/nrf24_jammer[U].fap
deleted file mode 100644
index 7b26912..0000000
Binary files a/compiled/nrf24_jammer[U].fap and /dev/null differ
diff --git a/compiled/nrf24_jammer_M.fap b/compiled/nrf24_jammer_M.fap
new file mode 100644
index 0000000..23764f4
Binary files /dev/null and b/compiled/nrf24_jammer_M.fap differ
diff --git a/compiled/nrf24_jammer_OF.fap b/compiled/nrf24_jammer_OF.fap
new file mode 100644
index 0000000..7d38333
Binary files /dev/null and b/compiled/nrf24_jammer_OF.fap differ
diff --git a/compiled/nrf24_jammer_R.fap b/compiled/nrf24_jammer_R.fap
new file mode 100644
index 0000000..b3bbd38
Binary files /dev/null and b/compiled/nrf24_jammer_R.fap differ
diff --git a/compiled/nrf24_jammer_U.fap b/compiled/nrf24_jammer_U.fap
new file mode 100644
index 0000000..f2bd5f5
Binary files /dev/null and b/compiled/nrf24_jammer_U.fap differ
diff --git a/jammer.c b/jammer.c
index c862b6b..0cdeea1 100644
--- a/jammer.c
+++ b/jammer.c
@@ -208,12 +208,18 @@ static int32_t mj_worker_thread(void* ctx) {
     NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
     notification_message(notification, &sequence_blink_red_100);
     
-    nrf24_set_tx_mode(nrf24_HANDLE);
-
-    if(plugin_state->jam_type != 3) nrf24_startConstCarrier(nrf24_HANDLE, 3, hopping_channels[0]);
+    
+    if(plugin_state->jam_type != 3) {
+        nrf24_deinit();
+        nrf24_init();
+        nrf24_set_tx_mode(nrf24_HANDLE);
+        nrf24_startConstCarrier(nrf24_HANDLE, 3, 45);
+    }
 
     uint8_t current_channel = 0;
     uint8_t limit = hopping_channels_len[plugin_state->jam_type];
+    
+    nrf24_set_tx_mode(nrf24_HANDLE);
 
     while(!plugin_state->close_thread_please) {
         for(int ch = 0; ch < limit && !plugin_state->close_thread_please; ch++) {
diff --git a/lib/nrf24/nrf24.c b/lib/nrf24/nrf24.c
index 8bfc76f..9f6e3e2 100644
--- a/lib/nrf24/nrf24.c
+++ b/lib/nrf24/nrf24.c
@@ -134,7 +134,10 @@ uint8_t nrf24_set_rate(FuriHalSpiBusHandle* handle, uint32_t rate) {
 }
 
 void nrf24_startConstCarrier(FuriHalSpiBusHandle* handle, uint8_t level, uint8_t channel) {
-    nrf24_set_idle(handle);
+    nrf24_deinit();
+    nrf24_init();
+
+    nrf24_set_tx_mode(handle);
 
     nrf24_write_reg(handle, REG_RF_CH, channel);
 
@@ -165,8 +168,6 @@ void nrf24_startConstCarrier(FuriHalSpiBusHandle* handle, uint8_t level, uint8_t
 }
 
 void nrf24_stopConstCarrier(FuriHalSpiBusHandle* handle) {
-    nrf24_set_idle(handle);
-
     uint8_t setup;
     nrf24_read_reg(handle, REG_RF_SETUP, &setup, 1);
     setup &= ~(NRF24_CONT_WAVE | NRF24_PLL_LOCK);