diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index e120d358a4..e7a9ea9e4c 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -365,7 +365,7 @@ void play_goodbye_tone()
 }
 
 uint8_t starting_note = 0x0C;
-int offset = 7;
+int offset = 0;
 
 void process_action_user(keyrecord_t *record) {
 
diff --git a/keyboard/planck/planck_pcb_r4.hex b/keyboard/planck/planck_pcb_r4.hex
index 889af7f225..bd68d9e904 100644
Binary files a/keyboard/planck/planck_pcb_r4.hex and b/keyboard/planck/planck_pcb_r4.hex differ
diff --git a/keyboard/planck/planck_pcb_r4_w_bootloader.hex b/keyboard/planck/planck_pcb_r4_w_bootloader.hex
index f2e9993ac8..140bf415f2 100644
Binary files a/keyboard/planck/planck_pcb_r4_w_bootloader.hex and b/keyboard/planck/planck_pcb_r4_w_bootloader.hex differ
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 95b9718762..b3aa14dcbe 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -319,7 +319,7 @@ void matrix_init_user(void) {
 #ifdef AUDIO_ENABLE
 
 uint8_t starting_note = 0x0C;
-int offset = 7;
+int offset = 0;
 
 void process_action_user(keyrecord_t *record) {
 
diff --git a/keyboard/preonic/preonic_pcb_r1.hex b/keyboard/preonic/preonic_pcb_r1.hex
index 5bdc190e1d..eda1b1979f 100644
Binary files a/keyboard/preonic/preonic_pcb_r1.hex and b/keyboard/preonic/preonic_pcb_r1.hex differ
diff --git a/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex b/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex
index a29f23c00e..c42365c436 100644
Binary files a/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex and b/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex differ
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 0921bd5931..d2316ba1b3 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -54,28 +54,28 @@ float voice_envelope(float frequency) {
             }
     	    break;
 
-        case octave_crunch:
-            polyphony_rate = 0;
-            switch (compensated_index) {
-                case 0 ... 9:
-                case 20 ... 24:
-                case 30 ... 32:
-                    frequency = frequency / 2;
-                    note_timbre = TIMBRE_12;
-                break;
+        // case octave_crunch:
+        //     polyphony_rate = 0;
+        //     switch (compensated_index) {
+        //         case 0 ... 9:
+        //         case 20 ... 24:
+        //         case 30 ... 32:
+        //             frequency = frequency / 2;
+        //             note_timbre = TIMBRE_12;
+        //         break;
 
-                case 10 ... 19:
-                case 25 ... 29:
-                case 33 ... 35:
-                    frequency = frequency * 2;
-                    note_timbre = TIMBRE_12;
-	                break;
+        //         case 10 ... 19:
+        //         case 25 ... 29:
+        //         case 33 ... 35:
+        //             frequency = frequency * 2;
+        //             note_timbre = TIMBRE_12;
+	       //          break;
 
-                default:
-                    note_timbre = TIMBRE_12;
-                	break;
-            }
-	        break;
+        //         default:
+        //             note_timbre = TIMBRE_12;
+        //         	break;
+        //     }
+	       //  break;
 
         case duty_osc:
             // This slows the loop down a substantial amount, so higher notes may freeze