diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts
index 2a7e95363..183cc72ee 100644
--- a/src/models/drive-file.ts
+++ b/src/models/drive-file.ts
@@ -25,6 +25,7 @@ export const getDriveFileBucket = async (): Promise<mongo.GridFSBucket> => {
 export type IMetadata = {
 	properties: any;
 	userId: mongo.ObjectID;
+	_user: any;
 	folderId: mongo.ObjectID;
 	comment: string;
 	uri: string;
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index e7f3572c7..50ee11734 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -15,7 +15,7 @@ import DriveFolder from '../../models/drive-folder';
 import { pack } from '../../models/drive-file';
 import event, { publishDriveStream } from '../../publishers/stream';
 import getAcct from '../../acct/render';
-import { IUser, isLocalUser } from '../../models/user';
+import { IUser, isLocalUser, isRemoteUser } from '../../models/user';
 import DriveFileThumbnail, { getDriveFileThumbnailBucket, DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
 import genThumbnail from '../../drive/gen-thumbnail';
 
@@ -284,6 +284,9 @@ const addFile = async (
 
 	const metadata = {
 		userId: user._id,
+		_user: {
+			host: user.host
+		},
 		folderId: folder !== null ? folder._id : null,
 		comment: comment,
 		properties: properties