diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts
index 56d652336ed1..e8e0310e6c00 100644
--- a/src/models/repositories/drive-file.ts
+++ b/src/models/repositories/drive-file.ts
@@ -25,7 +25,7 @@ export class DriveFileRepository extends Repository<DriveFile> {
 	public getPublicUrl(file: DriveFile, thumbnail = false): string | null {
 		let url = thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url);
 		if (file.uri != null && file.userHost != null && config.mediaProxy != null) {
-			url = `${config.mediaProxy}/${thumbnail ? 'thumbnail' : ''}?url=${file.uri}`;
+			url = `${config.mediaProxy}/${thumbnail ? 'thumbnail' : ''}?url=${encodeURIComponent(file.uri)}`;
 		}
 		return url;
 	}