diff --git a/lib/models/Course.php b/lib/models/Course.php
index 68ac7277a5bc9fdfc18b447b84f5e637a42b16aa..df70b4321d9b84e18be804bbd0f7f3d697eec05b 100644
--- a/lib/models/Course.php
+++ b/lib/models/Course.php
@@ -1597,6 +1597,17 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe
             );
         }
 
+        //Check the course membership:
+
+        if ($GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id)) {
+            return new \Studip\EnrolmentInformation(
+                _('Sie sind bereits in der Veranstaltung eingetragen.'),
+                \Studip\Information::INFO,
+                'already_member',
+                true
+            );
+        }
+
         //Check the course set and if the user is on an admission list:
 
         if ($course_set = $this->getCourseSet()) {
@@ -1671,17 +1682,6 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe
             );
         }
 
-        //Check the course membership:
-
-        if ($GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id)) {
-            return new \Studip\EnrolmentInformation(
-                _('Sie sind bereits in der Veranstaltung eingetragen.'),
-                \Studip\Information::INFO,
-                'already_member',
-                true
-            );
-        }
-
         //Check the admission status:
 
         $admission_status = $user->admission_applications->findBy('seminar_id', $this->id)->val('status');