diff --git a/report-viewer/src/model/fileHandling/ZipFileHandler.ts b/report-viewer/src/model/fileHandling/ZipFileHandler.ts
index 2e4d67d5f..595762179 100644
--- a/report-viewer/src/model/fileHandling/ZipFileHandler.ts
+++ b/report-viewer/src/model/fileHandling/ZipFileHandler.ts
@@ -12,10 +12,7 @@ export class ZipFileHandler extends FileHandler {
     return jszip.loadAsync(file).then(async (zip) => {
       for (const originalFileName of Object.keys(zip.files)) {
         const unixFileName = slash(originalFileName)
-        if (
-          /((.+\/)*)(files|submissions)\/(.+)\/(.+)/.test(unixFileName) &&
-          !/^__MACOSX\//.test(unixFileName)
-        ) {
+        if (/\/?(files)\//.test(unixFileName) && !/\/?__MACOSX\//.test(unixFileName)) {
           const directoryPath = unixFileName.substring(0, unixFileName.lastIndexOf('/'))
           const fileBase = unixFileName.substring(unixFileName.lastIndexOf('/') + 1)