diff --git a/server/logging/Logger.ts b/server/logging/Logger.ts
index ce734fd95..43feb9cfd 100644
--- a/server/logging/Logger.ts
+++ b/server/logging/Logger.ts
@@ -82,7 +82,7 @@ class Logger {
    * Debug information
    *
    * @param category A log message category that will be prepended
-   * @param extra Arbitrary data to be logged that will appear in prod logs
+   * @param extra Arbitrary data to be logged that will appear in development logs
    */
   public debug(label: LogCategory, message: string, extra?: Extra) {
     this.output.debug(message, { ...this.sanitize(extra), label });
diff --git a/server/utils/ZipHelper.ts b/server/utils/ZipHelper.ts
index fbe5efe21..b3205d7f3 100644
--- a/server/utils/ZipHelper.ts
+++ b/server/utils/ZipHelper.ts
@@ -59,7 +59,9 @@ export default class ZipHelper {
 
       let currentLevel = tree; // initialize currentLevel to root
 
-      pathParts.forEach(function (name) {
+      pathParts.forEach(function (rawName) {
+        const { name } = path.parse(path.basename(rawName));
+
         // check to see if the path already exists.
         const existingPath = find(currentLevel, {
           name,
@@ -69,13 +71,13 @@ export default class ZipHelper {
           // The path to this item was already in the tree, so don't add again.
           // Set the current level to this path's children
           currentLevel = existingPath.children;
-        } else if (name.endsWith(".DS_Store") || !name) {
+        } else if (rawName.endsWith(".DS_Store") || !rawName) {
           return;
         } else {
           const newPart = {
             name,
             path: filePath.replace(/^\//, ""),
-            title: deserializeFilename(path.parse(path.basename(name)).name),
+            title: deserializeFilename(name),
             children: [],
           };