diff --git a/src/daemon/keymap_patch.c b/src/daemon/keymap_patch.c
index bcba815b..a6a6e329 100644
--- a/src/daemon/keymap_patch.c
+++ b/src/daemon/keymap_patch.c
@@ -15,7 +15,6 @@ keypatch m55patch[] = {
     { 211, "mouse7", -1,        KEY_CORSAIR },
     { 213, "dpiup",  -1,        KEY_CORSAIR },
     { 237, "dpi",    LED_MOUSE, KEY_NONE },
-    { 239, NULL,     0,         KEY_NONE },
 };
 #define M55PATCH_LEN sizeof(m55patch)/sizeof(*m55patch)
 
@@ -37,38 +36,17 @@ keypatch icwpatch[] = {
     { 240, "dpi0",  LED_MOUSE + 3, KEY_NONE },
     { 241, "dpi1",  LED_MOUSE + 4, KEY_NONE },
     { 242, "dpi2",  LED_MOUSE + 5, KEY_NONE },
-    { 243, NULL,    0,             KEY_NONE },
-    { 244, NULL,    0,             KEY_NONE },
-    { 245, NULL,    0,             KEY_NONE },
-    { 246, NULL,    0,             KEY_NONE },
 };
 #define ICWPATCH_LEN sizeof(icwpatch)/sizeof(*icwpatch)
 
 keypatch harpoonwlpatch[] = {
     { 237, "dpi",  LED_MOUSE,     KEY_NONE },
     { 238, "back", LED_MOUSE + 1, KEY_NONE },
-    { 239, NULL,   0,             KEY_NONE },
-    { 240, NULL,   0,             KEY_NONE },
-    { 241, NULL,   0,             KEY_NONE },
-    { 242, NULL,   0,             KEY_NONE },
-    { 243, NULL,   0,             KEY_NONE },
-    { 244, NULL,   0,             KEY_NONE },
-    { 245, NULL,   0,             KEY_NONE },
-    { 246, NULL,   0,             KEY_NONE },
 };
 #define HARPOONWLPATCH_LEN sizeof(harpoonwlpatch)/sizeof(*harpoonwlpatch)
 
 keypatch katarproxtpatch[] = {
     { 237, "dpi",  LED_MOUSE,     KEY_NONE },
-    { 238, NULL,   0,             KEY_NONE },
-    { 239, NULL,   0,             KEY_NONE },
-    { 240, NULL,   0,             KEY_NONE },
-    { 241, NULL,   0,             KEY_NONE },
-    { 242, NULL,   0,             KEY_NONE },
-    { 243, NULL,   0,             KEY_NONE },
-    { 244, NULL,   0,             KEY_NONE },
-    { 245, NULL,   0,             KEY_NONE },
-    { 246, NULL,   0,             KEY_NONE },
 };
 #define KATARPROXTPATCH_LEN sizeof(katarproxtpatch)/sizeof(*katarproxtpatch)
 
@@ -91,6 +69,12 @@ keypatches mappatches[] = {
 };
 #define KEYPATCHES_LEN sizeof(mappatches)/sizeof(*mappatches)
 
+#define CLEAR_KEYMAP_ENTRY(x)   { \
+    (x).name = NULL; \
+    (x).led = -1; \
+    (x).scan = KEY_NONE; \
+}
+
 /// \brief
 ///
 /// Copy the keymap to the usbdevice struct, and iterate through the keypatches array.
@@ -125,9 +109,7 @@ void patchkeys(usbdevice* kb){
             kb->keymap[PROFSWITCH_M_IDX].led = -1;
             kb->keymap[PROFSWITCH_M_IDX].scan = KEY_CORSAIR;
             // Clear the keyboard one
-            kb->keymap[profswitch_kb_idx].name = NULL;
-            kb->keymap[profswitch_kb_idx].led = 0;
-            kb->keymap[profswitch_kb_idx].scan = KEY_NONE;
+            CLEAR_KEYMAP_ENTRY(kb->keymap[profswitch_kb_idx]);
         }
     }
 
@@ -137,10 +119,24 @@ void patchkeys(usbdevice* kb){
             // Iterate through the keys in the selected patch
             for(size_t i = 0; i < mappatches[pos].patchlen; i++){
                 keypatch* curpatch = mappatches[pos].patch;
-                int idx = curpatch[i].idx;
+                size_t idx = curpatch[i].idx;
                 kb->keymap[idx].name = curpatch[i].name;
                 kb->keymap[idx].led = curpatch[i].led;
                 kb->keymap[idx].scan = curpatch[i].scan;
+                // Now go through the full keymap so far and remove any entries that
+                // either the have same LED as what was patched in, or same name
+                for(size_t j = 0; j < sizeof(keymap)/sizeof(*keymap); j++){
+                    // Don't delete the freshly patched entry
+                    if(j == idx)
+                        continue;
+                    // Name first
+                    if(kb->keymap[j].name && curpatch[i].name && !strcmp(kb->keymap[j].name, curpatch[i].name))
+                        CLEAR_KEYMAP_ENTRY(kb->keymap[j]);
+                    // LED index
+                    // In this case, only reset the LED, as there's potential to break keybinds
+                    if(kb->keymap[j].led >= 0 && curpatch[i].led >= 0 && kb->keymap[j].led == curpatch[i].led)
+                        kb->keymap[j].led = -1;
+                }
             }
             return;
         }
diff --git a/src/daemon/keymap_patch.h b/src/daemon/keymap_patch.h
index e12f1de9..edc77af5 100644
--- a/src/daemon/keymap_patch.h
+++ b/src/daemon/keymap_patch.h
@@ -1,6 +1,6 @@
 // Keymap patches for specific devices
 typedef struct {
-    int idx; // Index of key to patch in keymap
+    size_t idx; // Index of key to patch in keymap
     const char* name;
     short led;
     short scan;
@@ -11,7 +11,7 @@ typedef struct {
     ushort vendor;
     ushort product;
     keypatch* patch;
-    unsigned patchlen;
+    size_t patchlen;
 } keypatches;
 
 ///
diff --git a/src/daemon/main.c b/src/daemon/main.c
index bef36b7e..06facc2e 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -236,6 +236,12 @@ int main(int argc, char** argv){
             }
 
             patchkeys(&dev);
+#if 0
+            for (int j = 0; j < N_KEYS_EXTENDED; j++) {
+                printf("{ %10s, %3hd, %4hd },\n", (dev.keymap[j].name ? dev.keymap[j].name : "NULL"),
+                    dev.keymap[j].led, dev.keymap[j].scan);
+            }
+#endif
 
             // Search through the patched keymap
             for (int j = 0; j < N_KEYS_EXTENDED; j++) {