diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php
index 149f2b8cbe186c16548c864db27835c48dac276e..f3260a9be6bcdf7074fcf6d363eeaa72f9337c79 100644
--- a/lib/filesystem/StandardFolder.php
+++ b/lib/filesystem/StandardFolder.php
@@ -134,12 +134,9 @@ class StandardFolder implements FolderType
         }
 
         if ($this->range_type === 'course') {
-            if (($user_id === null || $user_id === 'nobody')  && Config::get()->ENABLE_FREE_ACCESS) {
-                $range = $this->getRangeObject();
-                $visible = isset($range) && $range->lesezugriff == 0;
-            } else {
-                $visible = Seminar_Perm::get()->have_studip_perm('user', $this->range_id, $user_id);
-            }
+            $range = $this->getRangeObject();
+            $visible = Config::get()->ENABLE_FREE_ACCESS && isset($range) && $range->lesezugriff == 0
+                    || Seminar_Perm::get()->have_studip_perm('user', $this->range_id, $user_id);
         }
         return $visible;
     }