diff --git a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
index c8a0ecd9598..adca91d842e 100644
--- a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
+++ b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c
@@ -18,6 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
+//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection.
+#undef USB_POLLING_INTERVAL_MS
+#define USB_POLLING_INTERVAL_MS 8
+#undef USB_SUSPEND_WAKEUP_DELAY
+#define USB_SUSPEND_WAKEUP_DELAY 3000
+
 enum custom_layers {
     _BL,
     _FL,
diff --git a/keyboards/draytronics/elise/keymaps/default/keymap.c b/keyboards/draytronics/elise/keymaps/default/keymap.c
index ecafbf13c95..4637e339694 100644
--- a/keyboards/draytronics/elise/keymaps/default/keymap.c
+++ b/keyboards/draytronics/elise/keymaps/default/keymap.c
@@ -17,6 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 
+//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection.
+#undef USB_POLLING_INTERVAL_MS
+#define USB_POLLING_INTERVAL_MS 8
+#undef USB_SUSPEND_WAKEUP_DELAY
+#define USB_SUSPEND_WAKEUP_DELAY 3000
+
 enum custom_layers {
     _BL,
     _FL,
diff --git a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c
index 02f4b9c1cc8..1aab7e16526 100644
--- a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c
+++ b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c
@@ -18,6 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
+//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection.
+#undef USB_POLLING_INTERVAL_MS
+#define USB_POLLING_INTERVAL_MS 8
+#undef USB_SUSPEND_WAKEUP_DELAY
+#define USB_SUSPEND_WAKEUP_DELAY 3000
+
 enum custom_layers {
     _BL,
     _FL,