diff --git a/ms-windows/QGIS-Installer.nsi b/ms-windows/QGIS-Installer.nsi
index 024b48dad18..2ea56fde590 100644
--- a/ms-windows/QGIS-Installer.nsi
+++ b/ms-windows/QGIS-Installer.nsi
@@ -370,9 +370,16 @@ Section "QGIS" SecQGIS
 	IfFileExists "$INSTALL_DIR\etc\reboot" RebootNecessary NoRebootNecessary
 
 RebootNecessary:
+	IfSilent FlagRebootNecessary
 	SetRebootFlag true
+	Return
+
+FlagRebootNecessary:
+	SetErrorLevel 3010 ; ERROR_SUCCESS_REBOOT_REQUIRED
+	Return
 
 NoRebootNecessary:
+	Return
 
 SectionEnd
 !endif