diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 033e9e0255..710fd81316 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -504,6 +504,10 @@ Function PostInstallOptionsPage
 
     ; set the checkbox state depending on what is present in the registry
     !insertmacro SetPostInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
+    ${IfNot} $substringResult == ""
+        ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
+    ${EndIf}
 
     IntOp $CurrentOffset $CurrentOffset + 15
   ${EndIf}
@@ -514,6 +518,10 @@ Function PostInstallOptionsPage
 
 	  ; set the checkbox state depending on what is present in the registry
 	  !insertmacro SetPostInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+      ${StrContains} $substringResult "/forceNoLaunchClient" $CMDLINE
+      ${IfNot} $substringResult == ""
+          ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
+      ${EndIf}
   ${EndIf}
 
   ${If} @PR_BUILD@ == 1