1 files changed, 4 insertions, 3 deletions

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 04ae16224..336a83e9d 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -120,15 +120,16 @@ define EXEC_DFU
         if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
                 $(DFU_PROGRAMMER) $(MCU) erase --force; \
                 if [ "$(1)" ]; then \
-                        $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(QUANTUM_PATH)/split_common/$(1);\
+                        $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
                 fi; \
+                $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
         else \
                 $(DFU_PROGRAMMER) $(MCU) erase; \
                 if [ "$(1)" ]; then \
                         $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
                 fi; \
+                $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
         fi; \
-        $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
         $(DFU_PROGRAMMER) $(MCU) reset
 endef
 
@@ -141,7 +142,7 @@ dfu-start:
 
 dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
         if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
-                $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
+                $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(BUILD_DIR)/$(TARGET).eep;\
         else\
                 $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\
         fi