diff --git a/dist/win/bundle/bundleWithWinfsp.wxs b/dist/win/bundle/bundleWithWinfsp.wxs
index 841b4b779..991b44940 100644
--- a/dist/win/bundle/bundleWithWinfsp.wxs
+++ b/dist/win/bundle/bundleWithWinfsp.wxs
@@ -40,16 +40,17 @@
               DetectCondition="false"
               InstallCondition="InstalledLegacyWinFspVersion <> v0.0.0.0"
               >
-                <CommandLine Condition="WixBundleUILevel &lt;= 3" InstallArgument="-q" />
+                <CommandLine Condition="WixBundleUILevel &lt;= 3" InstallArgument="-q" RepairArgument="-q" UninstallArgument="-s" />
                 <!-- XML allows line breaks in attributes, hence keep the line breaks here -->
                 <CommandLine Condition="WixBundleUILevel &gt; 3" InstallArgument="-t &quot;Cryptomator Installer&quot; -m &quot;Cryptomator requires a newer version of the WinFsp driver. The installer will now uninstall WinFsp, possibly reboot, and afterwards proceed with the installation.
 
-Do you want to continue?&quot;" />
+Do you want to continue?&quot;" RepairArgument="-q" UninstallArgument="-s" />
                 <ExitCode Behavior="success" Value="0"/>
                 <ExitCode Behavior="success" Value="1"/>
                 <ExitCode Behavior="error" Value="2"/>
                 <ExitCode Behavior="error" Value="3"/>
                 <ExitCode Behavior="forceReboot" Value="4"/>
+                <ExitCode Behavior="success" Value="5"/>
             </ExePackage>
             <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/wix/msipackage.html-->
             <MsiPackage
diff --git a/dist/win/bundle/resources/winfsp-uninstaller.url b/dist/win/bundle/resources/winfsp-uninstaller.url
index f0ce0cac1..3d766479f 100644
--- a/dist/win/bundle/resources/winfsp-uninstaller.url
+++ b/dist/win/bundle/resources/winfsp-uninstaller.url
@@ -1,2 +1,2 @@
 [InternetShortcut]
-URL=https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta7/winfsp-uninstaller.exe
\ No newline at end of file
+URL=https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta8/winfsp-uninstaller.exe
\ No newline at end of file