diff --git a/src/api/public/media/media.controller.ts b/src/api/public/media/media.controller.ts
index a7f9d4ad3..e426908fe 100644
--- a/src/api/public/media/media.controller.ts
+++ b/src/api/public/media/media.controller.ts
@@ -25,7 +25,7 @@ import {
 import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { PermissionError } from '../../../errors/errors';
 import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { MediaUploadUrlDto } from '../../../media/media-upload-url.dto';
+import { MediaUploadDto } from '../../../media/media-upload.dto';
 import { MediaService } from '../../../media/media.service';
 import { MulterFile } from '../../../media/multer-file.interface';
 import { Note } from '../../../notes/note.entity';
@@ -69,7 +69,7 @@ export class MediaController {
     {
       code: 201,
       description: 'The file was uploaded successfully',
-      dto: MediaUploadUrlDto,
+      dto: MediaUploadDto,
     },
     400,
     403,
@@ -81,7 +81,7 @@ export class MediaController {
     @RequestUser() user: User,
     @UploadedFile() file: MulterFile,
     @Headers('HedgeDoc-Note') noteId: string,
-  ): Promise<MediaUploadUrlDto> {
+  ): Promise<MediaUploadDto> {
     // TODO: Move getting the Note object into a decorator
     const note: Note = await this.noteService.getNoteByIdOrAlias(noteId);
     this.logger.debug(
@@ -89,7 +89,7 @@ export class MediaController {
       'uploadMedia',
     );
     const upload = await this.mediaService.saveFile(file.buffer, user, note);
-    return this.mediaService.toMediaUploadUrlDto(upload.fileUrl);
+    return await this.mediaService.toMediaUploadDto(upload);
   }
 
   @Delete(':filename')
diff --git a/test/public-api/media.e2e-spec.ts b/test/public-api/media.e2e-spec.ts
index 857b8ee8e..868a85be1 100644
--- a/test/public-api/media.e2e-spec.ts
+++ b/test/public-api/media.e2e-spec.ts
@@ -58,7 +58,7 @@ describe('Media', () => {
         .set('HedgeDoc-Note', 'test_upload_media')
         .expect('Content-Type', /json/)
         .expect(201);
-      const path: string = uploadResponse.body.link;
+      const path: string = uploadResponse.body.url;
       const testImage = await fs.readFile('test/public-api/fixtures/test.png');
       const downloadResponse = await request(testSetup.app.getHttpServer()).get(
         path,