diff --git a/res/msi/Package/Package.wxs b/res/msi/Package/Package.wxs
index 9fbedd9ed..9a37b3092 100644
--- a/res/msi/Package/Package.wxs
+++ b/res/msi/Package/Package.wxs
@@ -32,6 +32,10 @@
 
 			<InstallExecute After="RemoveExistingProducts" />
 
+			<!--Only do InstallValidate if is not Uninstall-->
+			<!--Do InstallValidate if is Install, Change, Repair, Upgrade-->
+			<InstallValidate Condition="NOT (Installed AND REMOVE AND NOT UPGRADINGPRODUCTCODE )" />
+
 			<Custom Action="TerminateProcesses" Before="RemoveFiles"/>
 			<Custom Action="TerminateProcesses.SetParam" Before="TerminateProcesses"/>