diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts
index 718e8d0dc..66be0fb2f 100644
--- a/src/models/drive-file.ts
+++ b/src/models/drive-file.ts
@@ -28,7 +28,8 @@ export type IMetadata = {
 	_user: any;
 	folderId: mongo.ObjectID;
 	comment: string;
-	uri: string;
+	uri?: string;
+	url?: string;
 	deletedAt?: Date;
 	isExpired?: boolean;
 };
diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts
index 3f522f9b5..0d5a690c6 100644
--- a/src/remote/activitypub/models/image.ts
+++ b/src/remote/activitypub/models/image.ts
@@ -24,7 +24,7 @@ export async function createImage(actor: IRemoteUser, value): Promise<IDriveFile
 
 	log(`Creating the Image: ${image.url}`);
 
-	return await uploadFromUrl(image.url, actor);
+	return await uploadFromUrl(image.url, actor, null, image.url);
 }
 
 /**
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 1e5b75f12..8b5433078 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -62,6 +62,7 @@ const addFile = async (
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false,
+	url: string = null,
 	uri: string = null
 ): Promise<IDriveFile> => {
 	log(`registering ${name} (user: ${getAcct(user)}, path: ${path})`);
@@ -296,6 +297,10 @@ const addFile = async (
 		properties: properties
 	} as IMetadata;
 
+	if (url !== null) {
+		metadata.url = url;
+	}
+
 	if (uri !== null) {
 		metadata.uri = uri;
 	}
diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts
index 08e039770..ad2620c03 100644
--- a/src/services/drive/upload-from-url.ts
+++ b/src/services/drive/upload-from-url.ts
@@ -43,7 +43,7 @@ export default async (url, user, folderId = null, uri = null): Promise<IDriveFil
 	let error;
 
 	try {
-		driveFile = await create(user, path, name, null, folderId, false, uri);
+		driveFile = await create(user, path, name, null, folderId, false, url, uri);
 		log(`created: ${driveFile._id}`);
 	} catch (e) {
 		error = e;