diff --git a/setup/setup.nsi b/setup/setup.nsi
index 72e91d1..4086231 100644
--- a/setup/setup.nsi
+++ b/setup/setup.nsi
@@ -300,7 +300,6 @@ ${MementoSection} "$(SectionRootCerts)" ROOTCERTS
 	Call ConfigureCrypto
 
 	${IfNot} ${IsPostInstall}
-		Call DownloadRoots
 		Call UpdateRoots
 	${EndIf}
 ${MementoSectionEnd}
@@ -975,8 +974,7 @@ Function PreDownload
 	; General
 	Call DownloadWUA
 
-	${If} ${AtMostWin8.1}
-	${AndIf} ${SectionIsSelected} ${ROOTCERTS}
+	${If} ${SectionIsSelected} ${ROOTCERTS}
 		Call DownloadRoots
 	${EndIf}
 FunctionEnd