diff --git a/lib/filebrowser/file_info_context_module.php b/lib/filebrowser/file_info_context_module.php
index dc9cbb2325b..739eea9686d 100644
--- a/lib/filebrowser/file_info_context_module.php
+++ b/lib/filebrowser/file_info_context_module.php
@@ -111,10 +111,6 @@ class file_info_context_module extends file_info {
             return null;
         }
 
-        if (!isset($itemid)) {
-            return $this;
-        }
-
         $fs = get_file_storage();
 
         $filepath = is_null($filepath) ? '/' : $filepath;
@@ -139,10 +135,6 @@ class file_info_context_module extends file_info {
             return null;
         }
 
-        if (empty($itemid)) {
-            return $this;
-        }
-
         $fs = get_file_storage();
 
         $filepath = is_null($filepath) ? '/' : $filepath;
@@ -206,6 +198,7 @@ class file_info_context_module extends file_info {
                 $children[] = $child;
             }
         }
+
         return $children;
     }