diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index 0208a634b72a90fb1c3a83bfd6627f66a87ed01f..5bf8e491debfece9ab65bc68a9f028bf6d8dcce8 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -461,6 +461,10 @@ bool XMEGANVM_EraseMemory(const uint8_t EraseCommand,
 	if (!(XMEGANVM_WaitWhileNVMBusBusy()))
 	  return false;
 
+	/* Wait until the NVM controller is no longer busy */
+	if (!(XMEGANVM_WaitWhileNVMControllerBusy()))
+	  return false;
+
 	return true;
 }