diff --git a/admin/environment.xml b/admin/environment.xml
index ec4e38090cb..32bb20772ba 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -1135,6 +1135,11 @@
           <ON_ERROR message="quizattemptsupgradedmessage" />
         </FEEDBACK>
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
         <FEEDBACK>
           <ON_CHECK message="unsupporteddbtablerowformat" />
@@ -1264,6 +1269,11 @@
           <ON_ERROR message="quizattemptsupgradedmessage" />
         </FEEDBACK>
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
         <FEEDBACK>
           <ON_CHECK message="unsupporteddbtablerowformat" />
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 0c2349beb94..8cc30c3de82 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -2241,7 +2241,7 @@ function check_database_storage_engine(environment_results $result) {
 function check_slasharguments(environment_results $result){
     global $CFG;
 
-    if (empty($CFG->slasharguments)) {
+    if (!during_initial_install() && empty($CFG->slasharguments)) {
         $result->setInfo('slasharguments');
         $result->setStatus(false);
         return $result;