diff --git a/keyboards/massdrop/rocketeer/config_led.c b/keyboards/massdrop/rocketeer/config_led.c
new file mode 100644
index 00000000000..d27e8c16f28
--- /dev/null
+++ b/keyboards/massdrop/rocketeer/config_led.c
@@ -0,0 +1,139 @@
+#ifdef RGB_MATRIX_ENABLE
+#include "rocketeer.h"
+
+#include "led_matrix.h"
+#include "rgb_matrix.h"
+#include "config_led.h"
+
+led_config_t g_led_config = {
+  {
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13 },
+    { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
+    { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, NO_LED, 40 },
+    { 41, NO_LED, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NO_LED, 52 },
+    { 53, 54, 55, NO_LED, NO_LED, NO_LED, 56, NO_LED, NO_LED, NO_LED, 57, 58, 59, 60 }
+  },
+  {
+    {   8, 56 },
+    {  22, 56 },
+    {  35, 56 },
+    {  49, 56 },
+    {  63, 56 },
+    {  77, 56 },
+    {  91, 56 },
+    { 105, 56 },
+    { 118, 56 },
+    { 132, 56 },
+    { 146, 56 },
+    { 160, 56 },
+    { 174, 56 },
+    { 195, 56 },
+
+    {  11, 44 },
+    {  28, 44 },
+    {  42, 44 },
+    {  56, 44 },
+    {  70, 44 },
+    {  84, 44 },
+    {  98, 44 },
+    { 112, 44 },
+    { 125, 44 },
+    { 139, 44 },
+    { 153, 44 },
+    { 167, 44 },
+    { 181, 44 },
+    { 198, 44 },
+
+    {  13, 32 },
+    {  32, 32 },
+    {  46, 32 },
+    {  60, 32 },
+    {  73, 32 },
+    {  87, 32 },
+    { 101, 32 },
+    { 115, 32 },
+    { 129, 32 },
+    { 143, 32 },
+    { 156, 32 },
+    { 170, 32 },
+    // ___
+    { 193, 32 },
+
+    {  16, 19 },
+    {  39, 19 },
+    {  53, 19 },
+    {  67, 19 },
+    {  80, 19 },
+    {  94, 19 },
+    { 108, 19 },
+    { 122, 19 },
+    { 136, 19 },
+    { 150, 19 },
+    { 163, 19 },
+    // ___
+    { 182, 19 },
+
+    {   9,  7 },
+    {  27,  7 },
+    {  44,  7 },
+    // ___
+    // ___
+    // ___
+    {  96,  7 },
+    // ___
+    // ___
+    // ___
+    { 148,  7 },
+    { 165,  7 },
+    { 188,  7 },
+    { 201,  7 },
+
+    // Underglow
+    { 222, 64 },
+    { 204, 64 },
+    { 186, 64 },
+    { 167, 64 },
+    { 149, 64 },
+    { 130, 64 },
+    { 112, 64 },
+    {  94, 64 },
+    {  75, 64 },
+    {  57, 64 },
+    {  38, 64 },
+    {  20, 64 },
+    {   0, 64 },
+    {   0, 47 },
+    {   0, 32 },
+    {   0, 17 },
+    {   0,  0 },
+    {  20,  0 },
+    {  38,  0 },
+    {  57,  0 },
+    {  75,  0 },
+    {  94,  0 },
+    { 112,  0 },
+    { 130,  0 },
+    { 149,  0 },
+    { 167,  0 }
+  },
+  {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+    4, 4, 4,          4,          4, 4, 4, 4,
+
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1
+  }
+};
+
+#ifdef USB_LED_INDICATOR_ENABLE
+void rgb_matrix_indicators_kb(void)
+{
+  led_matrix_indicators();
+}
+#endif // USB_LED_INDICATOR_ENABLE
+
+#endif
diff --git a/keyboards/massdrop/rocketeer/keymaps/default_md/rules.mk b/keyboards/massdrop/rocketeer/keymaps/default_md/rules.mk
new file mode 100644
index 00000000000..064a6f54c1f
--- /dev/null
+++ b/keyboards/massdrop/rocketeer/keymaps/default_md/rules.mk
@@ -0,0 +1,2 @@
+# This keymap requires Massdrop Configurator support
+OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR
diff --git a/keyboards/massdrop/shift/config_led.c b/keyboards/massdrop/shift/config_led.c
index 3779c86db6f..1a677fa2c0e 100644
--- a/keyboards/massdrop/shift/config_led.c
+++ b/keyboards/massdrop/shift/config_led.c
@@ -5,6 +5,7 @@
 #include "rgb_matrix.h"
 #include "config_led.h"
 
+// TODO: convert this
 const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
   { { 0|(0<<4) }, { 6, 5 }, 0 },
   { { 0|(1<<4) }, { 29, 5 }, 0 },
diff --git a/tmk_core/common/arm_atsam/suspend.c b/tmk_core/common/arm_atsam/suspend.c
index 9c2c47d5610..adf259d08c3 100644
--- a/tmk_core/common/arm_atsam/suspend.c
+++ b/tmk_core/common/arm_atsam/suspend.c
@@ -78,7 +78,14 @@ void suspend_wakeup_init_kb(void) {
  */
 void suspend_wakeup_init(void) {
 #ifdef RGB_MATRIX_ENABLE
+#ifdef USE_MASSDROP_CONFIGURATOR
+    // TODO: need to re-add led_enabled?
+    // if (I2C3733_Control_Get()) {
+        I2C3733_Control_Set(1);
+    // }
+#else
     I2C3733_Control_Set(1);
+#endif
 #endif
 
     suspend_wakeup_init_kb();