diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index dcdaa01fab..92a9492d86 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -56,18 +56,20 @@ export default (
 
 	_target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
 
-	if (opts.detail && _target.folder_id) {
-		// Populate folder
-		_target.folder = await serializeDriveFolder(_target.folder_id, {
-			detail: true
-		});
-	}
+	if (opts.detail) {
+		if (_target.folder_id) {
+			// Populate folder
+			_target.folder = await serializeDriveFolder(_target.folder_id, {
+				detail: true
+			});
+		}
 
-	if (opts.detail && _target.tags) {
-		// Populate tags
-		_target.tags = await _target.tags.map(async (tag: any) =>
-			await serializeDriveTag(tag)
-		);
+		if (_target.tags) {
+			// Populate tags
+			_target.tags = await _target.tags.map(async (tag: any) =>
+				await serializeDriveTag(tag)
+			);
+		}
 	}
 
 	resolve(_target);