diff --git a/keyboards/planck/keymaps/jetpacktuxedo/config.h b/keyboards/planck/keymaps/jetpacktuxedo/config.h
index f216dc02dc..7efe97a573 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/config.h
+++ b/keyboards/planck/keymaps/jetpacktuxedo/config.h
@@ -2,6 +2,7 @@
 
 #ifdef AUDIO_ENABLE
     #define STARTUP_SONG SONG(PLANCK_SOUND)
+    #define AUDIO_CLICKY
 #endif
 
 /*
@@ -30,3 +31,4 @@
 
 // Most tactile encoders have detents every 4 stages
 #define ENCODER_RESOLUTION 4
+
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
index 2994c0c077..1324056862 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
@@ -189,6 +189,13 @@ uint8_t muse_offset = 70;
 uint16_t muse_tempo = 20;
 
 void encoder_update(bool clockwise) {
+  if (is_clicky_on()) {
+    if (clockwise) {
+      clicky_freq_up();
+    } else {
+      clicky_freq_down();
+    }
+  } else 
   if (muse_mode) {
     if (IS_LAYER_ON(_RAISE)) {
       if (clockwise) {
@@ -248,6 +255,12 @@ void dip_update(uint8_t index, bool active) {
           stop_all_notes();
         #endif
       }
+    case 2:
+      if (active) {
+        clicky_on();
+      } else {
+        clicky_off();
+      }
    }
 }