diff --git a/client/src/components/ManageArtist/AlbumFormComponents/ClickToEditInput.tsx b/client/src/components/ManageArtist/AlbumFormComponents/ClickToEditInput.tsx
index 246db7170..9fd2d8248 100644
--- a/client/src/components/ManageArtist/AlbumFormComponents/ClickToEditInput.tsx
+++ b/client/src/components/ManageArtist/AlbumFormComponents/ClickToEditInput.tsx
@@ -10,7 +10,8 @@ const ClickToEditInput: React.FC<{
   defaultValue: string;
   url: string;
   formKey: string;
-}> = ({ url, formKey, defaultValue }) => {
+  reload?: () => void;
+}> = ({ url, formKey, defaultValue, reload }) => {
   const [isEditing, setIsEditing] = React.useState(false);
   const methods = useForm({
     defaultValues: {
@@ -19,15 +20,11 @@ const ClickToEditInput: React.FC<{
   });
 
   const currentValue = methods.getValues(formKey);
+
   return (
     <>
       {!isEditing && (
-        <div
-        // className={css`
-        //   display: flex;
-        //   justify-content: space-between;
-        // `}
-        >
+        <div>
           {currentValue}
           <Button
             type="button"
@@ -47,7 +44,7 @@ const ClickToEditInput: React.FC<{
           `}
         >
           <FormProvider {...methods}>
-            <SavingInput formKey="title" url={url} />
+            <SavingInput formKey="title" url={url} reload={reload} />
             <Button
               type="button"
               variant="dashed"
diff --git a/client/src/components/ManageArtist/AlbumFormComponents/SavingInput.tsx b/client/src/components/ManageArtist/AlbumFormComponents/SavingInput.tsx
index fe250e7dc..b71a2d3da 100644
--- a/client/src/components/ManageArtist/AlbumFormComponents/SavingInput.tsx
+++ b/client/src/components/ManageArtist/AlbumFormComponents/SavingInput.tsx
@@ -22,6 +22,7 @@ const SavingInput: React.FC<{
   step?: string;
   type?: string;
   clearQueryKey?: string;
+  reload?: () => void;
 }> = ({
   formKey,
   url,
@@ -31,6 +32,7 @@ const SavingInput: React.FC<{
   rows,
   step,
   clearQueryKey,
+  reload,
 }) => {
   const { register, getValues } = useFormContext();
   const errorHandler = useErrorHandler();
@@ -83,6 +85,7 @@ const SavingInput: React.FC<{
         const timeout = setTimeout(() => {
           setIsSaving(false);
           setSaveSuccess(true);
+          reload?.();
           timeout2 = setTimeout(() => {
             setSaveSuccess(false);
           }, 1000);
diff --git a/client/src/components/ManageArtist/ManageTrackRow.tsx b/client/src/components/ManageArtist/ManageTrackRow.tsx
index 033066762..837a04f0d 100644
--- a/client/src/components/ManageArtist/ManageTrackRow.tsx
+++ b/client/src/components/ManageArtist/ManageTrackRow.tsx
@@ -1,6 +1,6 @@
 import { css } from "@emotion/css";
 import React from "react";
-import { FaPen, FaTrash } from "react-icons/fa";
+import { FaExclamationTriangle, FaPen, FaTrash } from "react-icons/fa";
 import useDraggableTrack from "utils/useDraggableTrack";
 
 import api from "services/api";
@@ -108,6 +108,8 @@ const ManageTrackRow: React.FC<{
     reload();
   }, [reload]);
 
+  console.log("track.audio", track.title, !track.title);
+
   if (isEditing) {
     return (
       <EditTrackRow
@@ -149,8 +151,13 @@ const ManageTrackRow: React.FC<{
           overflow: hidden;
           whitespace: nowrap;
           text-overflow: ellipsis;
+          background-color: ${!track.title
+            ? "var(--mi-warning-background-color)"
+            : "transparent"};
           &:hover {
-            background-color: transparent !important;
+            background-color: ${!track.title
+              ? "var(--mi-warning-background-color)"
+              : "transparent"};
           }
 
           &:before {
@@ -158,22 +165,40 @@ const ManageTrackRow: React.FC<{
           }
         `}
       >
-        <div>
-          <ClickToEditInput
-            defaultValue={track.title}
-            url={`manage/tracks/${track.id}`}
-            formKey="title"
-          />
-          <small>
-            {uploadState === "SUCCESS" && t("doneUploadingTrack")}
-            {uploadState === "STARTED" && (
-              <>
-                <LoadingSpinner />
-                {t("stillProcessing")}
-              </>
-            )}
-            {uploadState === "ERROR" && t("thereWasAnError")}
-          </small>
+        <div
+          className={css`
+            display: flex;
+            align-items: center;
+
+            > svg {
+              margin-right: 1rem;
+            }
+          `}
+        >
+          {!track.title && <FaExclamationTriangle />}
+          <div>
+            <ClickToEditInput
+              defaultValue={track.title}
+              url={`manage/tracks/${track.id}`}
+              formKey="title"
+              reload={reload}
+            />
+            <small>
+              {t("originalFilename", {
+                filename: track.audio?.originalFilename,
+              })}
+              <div>
+                {uploadState === "SUCCESS" && t("doneUploadingTrack")}
+                {uploadState === "STARTED" && (
+                  <>
+                    <LoadingSpinner />
+                    {t("stillProcessing")}
+                  </>
+                )}
+                {uploadState === "ERROR" && t("thereWasAnError")}
+              </div>
+            </small>
+          </div>
         </div>
       </td>
       <td
diff --git a/client/src/translation/en.json b/client/src/translation/en.json
index d8bdf290e..2003db530 100644
--- a/client/src/translation/en.json
+++ b/client/src/translation/en.json
@@ -642,6 +642,7 @@
     "delete": "Delete",
     "edit": "Edit",
     "listedArtists": "Listed artists",
+    "originalFilename": "Original file name: {{ filename }}",
     "status": "Can be played without purchase?",
     "statusPreview": "Preview",
     "statusMustOwn": "Must own",
@@ -671,7 +672,6 @@
     "imagesInPost": "Manage images in post",
     "imageIsFeatured": "Which image should be featured?",
     "confirmDelete": "Are you sure you want to delete this post?",
-    "newBlogPostFor": "New blog post for {{ artistName }}",
     "title": "Title:",
     "publicationDate": "Publication date:",
     "content": "Content",
diff --git a/client/src/types/index.d.ts b/client/src/types/index.d.ts
index 2d0896045..ffd82b6fb 100644
--- a/client/src/types/index.d.ts
+++ b/client/src/types/index.d.ts
@@ -35,6 +35,7 @@ interface Track {
     createdAt: string;
     duration: number; // in seconds
     uploadState: "STARTED" | "SUCCESS" | "ERROR";
+    originalFilename: string;
   };
   isPreview: boolean;
   trackArtists?: {
diff --git a/src/jobs/tasks/clean-up-files.ts b/src/jobs/tasks/clean-up-files.ts
index 0f622da46..aabd17aec 100644
--- a/src/jobs/tasks/clean-up-files.ts
+++ b/src/jobs/tasks/clean-up-files.ts
@@ -7,9 +7,15 @@ import {
 import { startCleaningUpOldFiles } from "../../queues/clean-up-old-files-queue";
 
 const cleanUpFiles = async (incomingFolder: string) => {
-  if (incomingFolder === trackGroupFormatBucket) {
-    logger.info("cleaning up files in the trackgroup minio container");
-    removeBucket(incomingFolder);
+  if (incomingFolder.startsWith(trackGroupFormatBucket)) {
+    const split = incomingFolder.split(/\/(.*)/);
+    const bucket = split[0];
+    const albumId = split[1];
+    logger.info(
+      `cleaning up ${albumId ?? "all files"} in the trackgroup minio container`
+    );
+
+    removeBucket(bucket, albumId);
     return {
       deleted: incomingFolder,
     };
@@ -49,9 +55,9 @@ const cleanUpFiles = async (incomingFolder: string) => {
   };
 };
 
-const removeBucket = async (bucketName: string) => {
+const removeBucket = async (bucketName: string, prefix: string) => {
   logger.info(`Removing all objects from ${bucketName}`);
-  await removeObjectsFromBucket(bucketName, "");
+  await removeObjectsFromBucket(bucketName, prefix ?? "");
 };
 
 export default cleanUpFiles;
diff --git a/src/routers/v1/admin/tasks.ts b/src/routers/v1/admin/tasks.ts
index 86a614b6e..a810f8b23 100644
--- a/src/routers/v1/admin/tasks.ts
+++ b/src/routers/v1/admin/tasks.ts
@@ -1,6 +1,5 @@
 import { NextFunction, Request, Response } from "express";
 import { userAuthenticated, userHasPermission } from "../../../auth/passport";
-import prisma from "@mirlo/prisma";
 import cleanUpFiles from "../../../jobs/tasks/clean-up-files";
 import initiateUserNotifcations from "../../../jobs/tasks/initiate-user-notifications";