diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 022f9338488b0df6bc14b4cb1935dd93e13d021e..49446114ac0364c624b1b17ccb77e68ed1c7d716 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -73,7 +73,11 @@ class BasicDataWizardStep implements CourseWizardStep
         $tpl->set_attribute('admission_turnout_mandatory_types', $admission_turnout_mandatory_types);
         // Select a default type if none is given.
         if (empty($values['coursetype'])) {
-            if ($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER && Request::isXhr()) {
+            if (
+                $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER
+                && $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER !== 'all'
+                && Request::isXhr()
+            ) {
                 $values['coursetype'] = $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER;
             } else {
                 $values['coursetype'] = 1;