diff --git a/app/Actions/Photo/Pipes/Shared/HydrateMetadata.php b/app/Actions/Photo/Pipes/Shared/HydrateMetadata.php
index e469147a991..1baeac006e4 100644
--- a/app/Actions/Photo/Pipes/Shared/HydrateMetadata.php
+++ b/app/Actions/Photo/Pipes/Shared/HydrateMetadata.php
@@ -66,6 +66,7 @@ public function handle(DuplicateDTO|StandaloneDTO $state, \Closure $next): Dupli
 		}
 		if ($state->photo->taken_at === null) {
 			$state->photo->taken_at = $state->exifInfo->taken_at;
+			$state->photo->initial_taken_at = $state->exifInfo->taken_at;
 		}
 		if ($state->photo->latitude === null) {
 			$state->photo->latitude = $state->exifInfo->latitude;
diff --git a/app/Contracts/Http/Requests/HasTakenAt.php b/app/Contracts/Http/Requests/HasTakenAt.php
new file mode 100644
index 00000000000..e5751dc9260
--- /dev/null
+++ b/app/Contracts/Http/Requests/HasTakenAt.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Contracts\Http\Requests;
+
+use Illuminate\Support\Carbon;
+
+interface HasTakenAt
+{
+	/**
+	 * @return Carbon|null
+	 */
+	public function takenAt(): ?Carbon;
+}
diff --git a/app/Contracts/Http/Requests/RequestAttribute.php b/app/Contracts/Http/Requests/RequestAttribute.php
index 2b2a3fa0a86..8fa524823fc 100644
--- a/app/Contracts/Http/Requests/RequestAttribute.php
+++ b/app/Contracts/Http/Requests/RequestAttribute.php
@@ -33,6 +33,7 @@ class RequestAttribute
 
 	public const TITLE_ATTRIBUTE = 'title';
 	public const UPLOAD_DATE_ATTRIBUTE = 'upload_date';
+	public const TAKEN_DATE_ATTRIBUTE = 'taken_at';
 	public const DESCRIPTION_ATTRIBUTE = 'description';
 	public const LICENSE_ATTRIBUTE = 'license';
 	public const ASPECT_RATIO_ATTRIBUTE = 'aspect_ratio';
diff --git a/app/Http/Controllers/Gallery/PhotoController.php b/app/Http/Controllers/Gallery/PhotoController.php
index 5d57fa3d477..46d06e059b2 100644
--- a/app/Http/Controllers/Gallery/PhotoController.php
+++ b/app/Http/Controllers/Gallery/PhotoController.php
@@ -140,6 +140,10 @@ public function update(EditPhotoRequest $request): PhotoResource
 		$photo->created_at = $request->uploadDate();
 		$photo->tags = $request->tags();
 		$photo->license = $request->license()->value;
+
+		// if the request takenAt is null, then we set the initial value back.
+		$photo->taken_at = $request->takenAt() ?? $photo->initial_taken_at;
+
 		$photo->save();
 
 		return PhotoResource::fromModel($photo);
diff --git a/app/Http/Requests/Photo/EditPhotoRequest.php b/app/Http/Requests/Photo/EditPhotoRequest.php
index 3a95390aa05..5748243bcbf 100644
--- a/app/Http/Requests/Photo/EditPhotoRequest.php
+++ b/app/Http/Requests/Photo/EditPhotoRequest.php
@@ -12,6 +12,7 @@
 use App\Contracts\Http\Requests\HasLicense;
 use App\Contracts\Http\Requests\HasPhoto;
 use App\Contracts\Http\Requests\HasTags;
+use App\Contracts\Http\Requests\HasTakenAt;
 use App\Contracts\Http\Requests\HasTitle;
 use App\Contracts\Http\Requests\HasUploadDate;
 use App\Contracts\Http\Requests\RequestAttribute;
@@ -21,6 +22,7 @@
 use App\Http\Requests\Traits\HasLicenseTrait;
 use App\Http\Requests\Traits\HasPhotoTrait;
 use App\Http\Requests\Traits\HasTagsTrait;
+use App\Http\Requests\Traits\HasTakenAtDateTrait;
 use App\Http\Requests\Traits\HasTitleTrait;
 use App\Http\Requests\Traits\HasUploadDateTrait;
 use App\Models\Photo;
@@ -32,7 +34,7 @@
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rules\Enum;
 
-class EditPhotoRequest extends BaseApiRequest implements HasPhoto, HasTags, HasUploadDate, HasDescription, HasLicense, HasTitle
+class EditPhotoRequest extends BaseApiRequest implements HasPhoto, HasTags, HasUploadDate, HasDescription, HasLicense, HasTitle, HasTakenAt
 {
 	use HasPhotoTrait;
 	use HasTitleTrait;
@@ -40,6 +42,7 @@ class EditPhotoRequest extends BaseApiRequest implements HasPhoto, HasTags, HasU
 	use HasTagsTrait;
 	use HasUploadDateTrait;
 	use HasLicenseTrait;
+	use HasTakenAtDateTrait;
 
 	/**
 	 * {@inheritDoc}
@@ -62,6 +65,7 @@ public function rules(): array
 			RequestAttribute::TAGS_ATTRIBUTE . '.*' => ['required', 'string', 'min:1'],
 			RequestAttribute::LICENSE_ATTRIBUTE => ['required', new Enum(LicenseType::class)],
 			RequestAttribute::UPLOAD_DATE_ATTRIBUTE => ['required', 'date'],
+			RequestAttribute::TAKEN_DATE_ATTRIBUTE => ['nullable', 'date'],
 		];
 	}
 
@@ -82,5 +86,10 @@ protected function processValidatedValues(array $values, array $files): void
 		$this->tags = $values[RequestAttribute::TAGS_ATTRIBUTE];
 		$this->upload_date = Carbon::parse($values[RequestAttribute::UPLOAD_DATE_ATTRIBUTE]);
 		$this->license = LicenseType::tryFrom($values[RequestAttribute::LICENSE_ATTRIBUTE]);
+
+		// We only set this one if it is not null
+		if (isset($values[RequestAttribute::TAKEN_DATE_ATTRIBUTE])) {
+			$this->taken_at = Carbon::parse($values[RequestAttribute::TAKEN_DATE_ATTRIBUTE]);
+		}
 	}
 }
diff --git a/app/Http/Requests/Traits/HasTakenAtDateTrait.php b/app/Http/Requests/Traits/HasTakenAtDateTrait.php
new file mode 100644
index 00000000000..d4da4524db3
--- /dev/null
+++ b/app/Http/Requests/Traits/HasTakenAtDateTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+namespace App\Http\Requests\Traits;
+
+use Illuminate\Support\Carbon;
+
+trait HasTakenAtDateTrait
+{
+	protected ?Carbon $taken_at = null;
+
+	/**
+	 * @return Carbon|null
+	 */
+	public function takenAt(): ?Carbon
+	{
+		return $this->taken_at;
+	}
+}
\ No newline at end of file
diff --git a/app/Http/Resources/Models/Utils/PreComputedPhotoData.php b/app/Http/Resources/Models/Utils/PreComputedPhotoData.php
index 78a8086048f..14fdfddb3c4 100644
--- a/app/Http/Resources/Models/Utils/PreComputedPhotoData.php
+++ b/app/Http/Resources/Models/Utils/PreComputedPhotoData.php
@@ -21,6 +21,7 @@ class PreComputedPhotoData extends Data
 	public bool $is_camera_date;
 	public bool $has_exif;
 	public bool $has_location;
+	public bool $is_taken_at_modified;
 
 	public function __construct(Photo $photo)
 	{
@@ -30,6 +31,10 @@ public function __construct(Photo $photo)
 		$this->is_camera_date = $photo->taken_at !== null;
 		$this->has_exif = $this->genExifHash($photo) !== '';
 		$this->has_location = $this->has_location($photo);
+		// if taken_at is null, it is for sure not modified.
+		// if taken_at is not null, then it is modified if initial_taken_at is null or if taken_at is different from initial_taken_at.
+		// dd($photo->taken_at, $photo->initial_taken_at, $photo->taken_at->notEqualTo($photo->initial_taken_at));
+		$this->is_taken_at_modified = $photo->taken_at !== null && ($photo->initial_taken_at === null || $photo->taken_at->notEqualTo($photo->initial_taken_at));
 	}
 
 	private function has_location(Photo $photo): bool
diff --git a/app/Legacy/Actions/Photo/Strategies/AbstractAddStrategy.php b/app/Legacy/Actions/Photo/Strategies/AbstractAddStrategy.php
index eff088adb83..ee16034c567 100644
--- a/app/Legacy/Actions/Photo/Strategies/AbstractAddStrategy.php
+++ b/app/Legacy/Actions/Photo/Strategies/AbstractAddStrategy.php
@@ -82,6 +82,7 @@ protected function hydrateMetadata(): void
 		}
 		if ($this->photo->taken_at === null) {
 			$this->photo->taken_at = $this->parameters->exifInfo->taken_at;
+			$this->photo->initial_taken_at = $this->parameters->exifInfo->taken_at;
 		}
 		if ($this->photo->latitude === null) {
 			$this->photo->latitude = $this->parameters->exifInfo->latitude;
diff --git a/app/Models/Photo.php b/app/Models/Photo.php
index 2e4bb9aeec9..100419d6f1d 100644
--- a/app/Models/Photo.php
+++ b/app/Models/Photo.php
@@ -61,6 +61,8 @@
  * @property string|null  $location
  * @property Carbon|null  $taken_at
  * @property string|null  $taken_at_orig_tz
+ * @property Carbon|null  $initial_taken_at
+ * @property string|null  $initial_taken_at_orig_tz
  * @property bool         $is_starred
  * @property string|null  $live_photo_short_path
  * @property string|null  $live_photo_url
@@ -153,7 +155,9 @@ class Photo extends Model
 		'created_at' => 'datetime',
 		'updated_at' => 'datetime',
 		'taken_at' => DateTimeWithTimezoneCast::class,
+		'initial_taken_at' => DateTimeWithTimezoneCast::class,
 		'live_photo_url' => MustNotSetCast::class . ':live_photo_short_path',
+		'taken_at_mod' => 'datetime',
 		'owner_id' => 'integer',
 		'is_starred' => 'boolean',
 		'tags' => ArrayCast::class,
diff --git a/database/factories/PhotoFactory.php b/database/factories/PhotoFactory.php
index 71be09427ef..689efef5758 100644
--- a/database/factories/PhotoFactory.php
+++ b/database/factories/PhotoFactory.php
@@ -37,6 +37,8 @@ class PhotoFactory extends Factory
 	 */
 	public function definition(): array
 	{
+		$now = now();
+
 		return [
 			'title' => 'CR_' . fake()->numerify('####'),
 			'description' => null,
@@ -50,8 +52,10 @@ public function definition(): array
 			'lens' => 'EF200mm f/2L IS',
 			'shutter' => '1/320 s',
 			'focal' => '200mm',
-			'taken_at' => now(),
+			'initial_taken_at' => $now,
 			'taken_at_orig_tz' => null,
+			'taken_at' => $now,
+			'initial_taken_at_orig_tz' => null,
 			'is_starred' => false,
 			'album_id' => null,
 			'checksum' => sha1(rand()),
diff --git a/database/migrations/2025_01_24_200235_add_initial_taken_at.php b/database/migrations/2025_01_24_200235_add_initial_taken_at.php
new file mode 100644
index 00000000000..0e13d288dfd
--- /dev/null
+++ b/database/migrations/2025_01_24_200235_add_initial_taken_at.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2025 LycheeOrg.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+	/**
+	 * Run the migrations.
+	 */
+	public function up(): void
+	{
+		Schema::table('photos', function (Blueprint $table): void {
+			$table->dateTime('initial_taken_at', 0)->nullable(true)->default(null)->after('taken_at_orig_tz')->comment('backup of the original taken_at value');
+			$table->string('initial_taken_at_orig_tz', 31)->nullable(true)->default(null)->after('initial_taken_at')->comment('backup of the timezone at which the photo has originally been taken');
+		});
+
+		// Set initial values
+		DB::table('photos')->update([
+			'initial_taken_at' => DB::raw('taken_at'),
+			'initial_taken_at_orig_tz' => DB::raw('taken_at_orig_tz'),
+		]);
+	}
+
+	/**
+	 * Reverse the migrations.
+	 */
+	public function down(): void
+	{
+		Schema::table('photos', function (Blueprint $table) {
+			$table->dropColumn('initial_taken_at_orig_tz');
+		});
+		Schema::table('photos', function (Blueprint $table) {
+			$table->dropColumn('initial_taken_at');
+		});
+	}
+};
diff --git a/lang/cz/gallery.php b/lang/cz/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/cz/gallery.php
+++ b/lang/cz/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/de/gallery.php b/lang/de/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/de/gallery.php
+++ b/lang/de/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/el/gallery.php b/lang/el/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/el/gallery.php
+++ b/lang/el/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/en/gallery.php b/lang/en/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/en/gallery.php
+++ b/lang/en/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/es/gallery.php b/lang/es/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/es/gallery.php
+++ b/lang/es/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/fr/gallery.php b/lang/fr/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/fr/gallery.php
+++ b/lang/fr/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/hu/gallery.php b/lang/hu/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/hu/gallery.php
+++ b/lang/hu/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/it/gallery.php b/lang/it/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/it/gallery.php
+++ b/lang/it/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/ja/gallery.php b/lang/ja/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/ja/gallery.php
+++ b/lang/ja/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/nl/gallery.php b/lang/nl/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/nl/gallery.php
+++ b/lang/nl/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/no/gallery.php b/lang/no/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/no/gallery.php
+++ b/lang/no/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/pl/gallery.php b/lang/pl/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/pl/gallery.php
+++ b/lang/pl/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/pt/gallery.php b/lang/pt/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/pt/gallery.php
+++ b/lang/pt/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/ru/gallery.php b/lang/ru/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/ru/gallery.php
+++ b/lang/ru/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/sk/gallery.php b/lang/sk/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/sk/gallery.php
+++ b/lang/sk/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/sv/gallery.php b/lang/sv/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/sv/gallery.php
+++ b/lang/sv/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/vi/gallery.php b/lang/vi/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/vi/gallery.php
+++ b/lang/vi/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/zh_CN/gallery.php b/lang/zh_CN/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/zh_CN/gallery.php
+++ b/lang/zh_CN/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/lang/zh_TW/gallery.php b/lang/zh_TW/gallery.php
index eb8008827e0..a56564245f2 100644
--- a/lang/zh_TW/gallery.php
+++ b/lang/zh_TW/gallery.php
@@ -177,6 +177,8 @@
 			'no_tags' => 'No Tags',
 			'set_tags' => 'Set Tags',
 			'set_created_at' => 'Set Upload Date',
+			'set_taken_at' => 'Set Taken Date',
+			'set_taken_at_info' => 'When set, a star %s will be displayed to indicate that this date is not the original EXIF date.<br>Untick the checkbox and save to reset to the original date.',
 		],
 	],
 
diff --git a/resources/js/components/drawers/PhotoDetails.vue b/resources/js/components/drawers/PhotoDetails.vue
index 1b4f1135127..283e40b45da 100644
--- a/resources/js/components/drawers/PhotoDetails.vue
+++ b/resources/js/components/drawers/PhotoDetails.vue
@@ -2,9 +2,9 @@
 	<aside
 		id="lychee_sidebar_container"
 		class="h-full relative transition-all overflow-x-clip overflow-y-scroll bg-bg-800"
-		:class="areDetailsOpen ? 'w-[360px]' : 'w-0 translate-x-full'"
+		:class="areDetailsOpen ? 'w-[380px]' : 'w-0 translate-x-full'"
 	>
-		<Card id="lychee_sidebar" v-if="props.photo" class="w-[360px] h-full pr-4 break-words">
+		<Card id="lychee_sidebar" v-if="props.photo" class="w-[380px] h-full pr-4 break-words">
 			<template #content>
 				<div class="grid grid-cols-[auto minmax(0, 1fr)] mt-8">
 					<h1 class="col-span-2 text-center text-lg font-bold my-4">
@@ -64,8 +64,12 @@
 					<h2 v-if="props.photo.precomputed.has_exif" class="col-span-2 text-muted-color font-bold px-3 pt-4 pb-3">
 						{{ $t("gallery.photo.details.camera") }}
 					</h2>
-					<span class="py-0.5 px-3 text-sm" v-if="props.photo.preformatted.taken_at">{{ $t("gallery.photo.details.captured") }}</span>
-					<span class="py-0.5 pl-0 text-sm" v-if="props.photo.preformatted.taken_at">{{ props.photo.preformatted.taken_at }}</span>
+					<span class="py-0.5 px-3 text-sm" v-if="props.photo.preformatted.taken_at"
+						>{{ $t("gallery.photo.details.captured")
+						}}<span v-if="props.photo.precomputed.is_taken_at_modified" class="ml-1 text-warning-600">*</span></span
+					>
+					<span class="py-0.5 pl-0 text-sm">{{ props.photo.preformatted.taken_at }}</span>
+
 					<span class="py-0.5 px-3 text-sm" v-if="props.photo.make">{{ $t("gallery.photo.details.make") }}</span>
 					<span class="py-0.5 pl-0 text-sm" v-if="props.photo.make">{{ props.photo.make }}</span>
 					<span class="py-0.5 px-3 text-sm" v-if="props.photo.model">{{ $t("gallery.photo.details.type") }}</span>
diff --git a/resources/js/components/drawers/PhotoEdit.vue b/resources/js/components/drawers/PhotoEdit.vue
index ca3d1bd4905..414478dc885 100644
--- a/resources/js/components/drawers/PhotoEdit.vue
+++ b/resources/js/components/drawers/PhotoEdit.vue
@@ -32,6 +32,48 @@
 						class="border-0 p-0 w-full border-b hover:border-b-primary-400 focus:border-b-primary-400"
 					/>
 
+					<label for="takenAtDate" class="font-bold mt-4 md:mt-0 self-center">{{ $t("gallery.photo.edit.set_taken_at") }}</label>
+
+					<InputGroup>
+						<InputGroupAddon class="border-t-0 rounded-tl-none">
+							<Checkbox v-model="is_taken_at_modified" :binary="true" v-tooltip="'Modify taken date'" />
+						</InputGroupAddon>
+						<DatePicker
+							id="takenAtDate"
+							v-model="takenAtDate"
+							:showTime="true"
+							hourFormat="24"
+							dateFormat=""
+							:showSeconds="true"
+							:disabled="!is_taken_at_modified"
+							:class="{
+								'border-0 p-0 w-full border-b hover:border-b-primary-400 focus:border-b-primary-400 rounded-br-none': true,
+								'border-dashed': !is_taken_at_modified,
+							}"
+						/>
+						<InputGroupAddon
+							:class="{
+								'border-t-0 border-r-0 rounded-br-none hover:border-b-primary-400': true,
+								'border-dashed': !is_taken_at_modified,
+							}"
+						>
+							<Select
+								v-model="takenAtTz"
+								:options="timeZoneOptions"
+								option-label="label"
+								option-value="value"
+								:disabled="!is_taken_at_modified"
+								:invalid="!takenAtTz"
+								class="border-none"
+							></Select>
+						</InputGroupAddon>
+					</InputGroup>
+					<div></div>
+					<div
+						class="mt-0 md:-mt-2 text-sm text-muted-color"
+						v-html="sprintf($t('gallery.photo.edit.set_taken_at_info'), '<span class=\'text-warning-600\'>*</span>')"
+					></div>
+
 					<label for="license" class="font-bold mt-4 md:mt-0 self-center">{{ $t("gallery.photo.edit.set_license") }}</label>
 					<Select
 						id="license"
@@ -66,14 +108,18 @@ import Card from "primevue/card";
 import Drawer from "primevue/drawer";
 import { ref, Ref, watch } from "vue";
 import InputText from "@/components/forms/basic/InputText.vue";
-import { licenseOptions, SelectOption, SelectBuilders } from "@/config/constants";
+import { licenseOptions, SelectOption, SelectBuilders, timeZoneOptions } from "@/config/constants";
 import Select from "primevue/select";
 import Textarea from "@/components/forms/basic/Textarea.vue";
 import DatePicker from "primevue/datepicker";
 import AutoComplete from "primevue/autocomplete";
 import PhotoService from "@/services/photo-service";
 import Button from "primevue/button";
+import InputGroup from "primevue/inputgroup";
+import InputGroupAddon from "primevue/inputgroupaddon";
 import { useToast } from "primevue/usetoast";
+import Checkbox from "primevue/checkbox";
+import { sprintf } from "sprintf-js";
 
 const props = defineProps<{
 	photo: App.Http.Resources.Models.PhotoResource;
@@ -86,11 +132,12 @@ const photo_id = ref<string | undefined>(undefined);
 const title = ref<string | undefined>(undefined);
 const description = ref<string | undefined>(undefined);
 const uploadDate = ref<Date | undefined>(undefined);
+const takenAtDate = ref<Date | undefined>(undefined);
 const tags = ref<string[]>([]);
+const is_taken_at_modified = ref<boolean>(false);
 const license = ref<SelectOption<App.Enum.LicenseType> | undefined>(undefined);
 const uploadTz = ref<string | undefined>(undefined);
-
-// TODO: updating exif data later
+const takenAtTz = ref<string | undefined>(undefined);
 
 function load(photo: App.Http.Resources.Models.PhotoResource) {
 	photo_id.value = photo.id;
@@ -98,9 +145,14 @@ function load(photo: App.Http.Resources.Models.PhotoResource) {
 	description.value = photo.description;
 	tags.value = photo.tags;
 
-	const dataDate = (photo.created_at ?? "").slice(0, 16);
-	uploadTz.value = (photo.created_at ?? "").slice(16);
+	const dataDate = (photo.created_at ?? "").slice(0, 19);
+	uploadTz.value = (photo.created_at ?? "").slice(19);
 	uploadDate.value = new Date(dataDate);
+	is_taken_at_modified.value = photo.precomputed.is_taken_at_modified;
+
+	const takenDate = (photo.taken_at ?? "").slice(0, 19);
+	takenAtTz.value = (photo.taken_at ?? "").slice(19);
+	takenAtDate.value = new Date(takenDate);
 
 	license.value = SelectBuilders.buildLicense(photo.license);
 }
@@ -110,12 +162,15 @@ function save() {
 		return;
 	}
 
+	const takenDate = takenAtDate.value === undefined ? null : takenAtDate.value.toISOString().slice(0, 19) + takenAtTz.value;
+
 	PhotoService.update(photo_id.value, {
 		title: title.value,
 		description: description.value ?? "",
 		tags: tags.value ?? [],
 		license: license.value?.value ?? "none",
-		upload_date: uploadDate.value?.toISOString().slice(0, 16) + uploadTz.value,
+		upload_date: uploadDate.value?.toISOString().slice(0, 19) + uploadTz.value,
+		taken_at: is_taken_at_modified.value ? takenDate : null,
 	}).then((response) => {
 		toast.add({ severity: "success", summary: "Success", life: 3000 });
 		load(response.data);
diff --git a/resources/js/components/gallery/photo/Overlay.vue b/resources/js/components/gallery/photo/Overlay.vue
index 91e7b5db19d..e0e2c48111c 100644
--- a/resources/js/components/gallery/photo/Overlay.vue
+++ b/resources/js/components/gallery/photo/Overlay.vue
@@ -9,7 +9,7 @@
 		<p class="mt-1 text-base sm:text-xl text-surface-400" v-if="props.imageOverlayType === 'date'">
 			<MiniIcon v-if="props.photo.precomputed.is_camera_date" icon="camera-slr" class="w-4 h-4 m-0 mr-1 -mt-1 fill-surface-400" />{{
 				props.photo.preformatted.date_overlay
-			}}
+			}}<span v-if="props.photo.precomputed.is_taken_at_modified" class="text-warning-600">*</span>
 		</p>
 		<p class="mt-1 text-base sm:text-xl text-surface-400" v-if="props.imageOverlayType === 'exif' && props.photo.precomputed.is_video">
 			{{ props.photo.preformatted.duration }} at {{ props.photo.preformatted.fps }} fps
diff --git a/resources/js/config/constants.ts b/resources/js/config/constants.ts
index a53fd2b2a00..389678980cc 100644
--- a/resources/js/config/constants.ts
+++ b/resources/js/config/constants.ts
@@ -121,6 +121,39 @@ export const timelineAlbumGranularityOptions: SelectOption<App.Enum.TimelineAlbu
 	{ value: "day", label: "gallery.timeline.day" },
 ];
 
+export const timeZoneOptions: SelectOption<string>[] = [
+	{ value: "-12:00", label: "-12:00 Uninhabited areas (Baker Island)" },
+	{ value: "-11:00", label: "-11:00 Niue Time" },
+	{ value: "-10:00", label: "-10:00 HST Hawaii Standard Time" },
+	{ value: "-09:00", label: "-09:00 AKST Alaska Standard Time" },
+	{ value: "-08:00", label: "-08:00 PST Pacific Standard Time (US)" },
+	{ value: "-07:00", label: "-07:00 MST Mountain Standard Time (US)" },
+	{ value: "-06:00", label: "-06:00 CST (US) Central Standard Time (US)" },
+	{ value: "-05:00", label: "-05:00 EST/ACT Eastern Standard Time (US)/Acre Time" },
+	{ value: "-04:00", label: "-04:00 AMT Amazon Time" },
+	{ value: "-03:30", label: "-03:30 NST Newfoundland Standard Time" },
+	{ value: "-03:00", label: "-03:00 ADT Atlantic Daylight Time" },
+	{ value: "-02:00", label: "-02:00 South Georgia and Sandwich Islands" },
+	{ value: "-01:00", label: "-01:00 Azores Time" },
+	{ value: "+00:00", label: "+00:00 UTC/GMT Coordinated Universal Time/Greenwich Mean Time" },
+	{ value: "+01:00", label: "+01:00 CET/BST Central European Time/British Summer Time" },
+	{ value: "+02:00", label: "+02:00 EET/CEST Eastern European Time/Central European Summer Time" },
+	{ value: "+03:00", label: "+03:00 MSK/AST/EEST Moscow Standard Time/Arabian Standard Time/Eastern European Summer Time" },
+	{ value: "+03:30", label: "+03:30 IRST Iran Standard Time" },
+	{ value: "+04:00", label: "+04:00 GST/AZT Gulf Standard Time/Azerbaijan Time" },
+	{ value: "+04:30", label: "+04:30 AFT Afghanistan Time" },
+	{ value: "+05:00", label: "+05:00 PKT Pakistan Standard Time" },
+	{ value: "+05:30", label: "+05:30 IST Indian Standard Time" },
+	{ value: "+06:00", label: "+06:00 Bhutan Time" },
+	{ value: "+07:00", label: "+07:00 ICT Indochina Time" },
+	{ value: "+08:00", label: "+08:00 CST (China)/HKT China Standard Time/Hong Kong Time" },
+	{ value: "+09:00", label: "+09:00 JST/KST Japan Standard Time/Korea Standard Time" },
+	{ value: "+09:30", label: "+09:30 ACST Australian Central Standard Time" },
+	{ value: "+10:00", label: "+10:00 AEST Australian Eastern Standard Time" },
+	{ value: "+11:00", label: "+11:00 Solomon Islands Time" },
+	{ value: "+12:00", label: "+12:00 NZST New Zealand Standard Time" },
+];
+
 export const SelectBuilders = {
 	buildPhotoSorting(value: string | App.Enum.ColumnSortingType | undefined): SelectOption<App.Enum.ColumnSortingPhotoType> | undefined {
 		return photoSortingColumnsOptions.find((option) => option.value === value) || undefined;
diff --git a/resources/js/lychee.d.ts b/resources/js/lychee.d.ts
index 42f9d7ba732..8ec32975044 100644
--- a/resources/js/lychee.d.ts
+++ b/resources/js/lychee.d.ts
@@ -497,6 +497,7 @@ declare namespace App.Http.Resources.Models.Utils {
 		is_camera_date: boolean;
 		has_exif: boolean;
 		has_location: boolean;
+		is_taken_at_modified: boolean;
 	};
 	export type PreFormattedAlbumData = {
 		url: string | null;
diff --git a/resources/js/services/photo-service.ts b/resources/js/services/photo-service.ts
index c4fac5264b8..5f539b436a6 100644
--- a/resources/js/services/photo-service.ts
+++ b/resources/js/services/photo-service.ts
@@ -7,6 +7,7 @@ export type PhotoUpdateRequest = {
 	tags: string[];
 	license: App.Enum.LicenseType;
 	upload_date: string;
+	taken_at: string | null;
 };
 
 const PhotoService = {
diff --git a/resources/js/style/preset.ts b/resources/js/style/preset.ts
index 473f3470947..17d3c1a1466 100644
--- a/resources/js/style/preset.ts
+++ b/resources/js/style/preset.ts
@@ -796,7 +796,22 @@ const LycheePrimeVueConfig = {
 				},
 			},
 		},
+		inputgroup: {
+			addon: {
+				background: "transparent",
+			},
+		},
 		inputtext: {
+			disabled: {
+				colorScheme: {
+					light: {
+						background: "{surface.700}",
+					},
+					dark: {
+						background: "var(--surface-950)",
+					},
+				},
+			},
 			background: "transparent",
 			padding: {
 				x: "1rem",
@@ -957,6 +972,9 @@ const LycheePrimeVueConfig = {
 					},
 				},
 				dark: {
+					disabled: {
+						background: "transparent",
+					},
 					option: {
 						color: "{surface.400}",
 						focus: {
diff --git a/resources/js/views/gallery-panels/Photo.vue b/resources/js/views/gallery-panels/Photo.vue
index b4222ad30f5..bd122aafe08 100644
--- a/resources/js/views/gallery-panels/Photo.vue
+++ b/resources/js/views/gallery-panels/Photo.vue
@@ -314,6 +314,12 @@ function scrollTo(event: WheelEvent) {
 		return;
 	}
 
+	if (is_edit_open.value) {
+		// We do nothing! Otherwise we are switching photos without noticing.
+		// especially with trackpads.
+		return;
+	}
+
 	if (route.name !== "photo") {
 		return;
 	}
diff --git a/tests/Feature_v2/Photo/PhotoEditTest.php b/tests/Feature_v2/Photo/PhotoEditTest.php
index 183e2604281..df3cd6922c5 100644
--- a/tests/Feature_v2/Photo/PhotoEditTest.php
+++ b/tests/Feature_v2/Photo/PhotoEditTest.php
@@ -18,11 +18,12 @@
 
 namespace Tests\Feature_v2\Photo;
 
+use Illuminate\Support\Facades\DB;
 use Tests\Feature_v2\Base\BaseApiV2Test;
 
 class PhotoEditTest extends BaseApiV2Test
 {
-	public function testEditPhotoUnauthorizedForbidden(): void
+	public function testEditPhotoUnauthorizedForbiddenUnprocessable(): void
 	{
 		$response = $this->patchJson('Photo', []);
 		$this->assertUnprocessable($response);
@@ -33,6 +34,7 @@ public function testEditPhotoUnauthorizedForbidden(): void
 			'description' => 'new description',
 			'tags' => ['tag1'],
 			'license' => 'none',
+			'taken_at' => null,
 			'upload_date' => '2021-01-01',
 		]);
 		$this->assertUnauthorized($response);
@@ -43,42 +45,173 @@ public function testEditPhotoUnauthorizedForbidden(): void
 			'description' => 'new description',
 			'tags' => ['tag1'],
 			'license' => 'none',
+			'taken_at' => null,
 			'upload_date' => '2021-01-01',
 		]);
 		$this->assertForbidden($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', []);
+		$this->assertUnprocessable($response);
 	}
 
 	public function testEditPhotoAuthorizedOwner(): void
 	{
-		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', []);
-		$this->assertUnprocessable($response);
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
+			'photo_id' => $this->photo1->id,
+			'title' => 'new title',
+			'description' => 'new description',
+			'tags' => ['tag1'],
+			'license' => 'none',
+			'taken_at' => null,
+			'upload_date' => '2021-01-01',
+		]);
+		$this->assertOk($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
+		$this->assertOk($response);
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', false);
 
+		// Test setting taken_at
 		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
 			'photo_id' => $this->photo1->id,
 			'title' => 'new title',
 			'description' => 'new description',
 			'tags' => ['tag1'],
 			'license' => 'none',
+			'taken_at' => '2021-01-01T00:00:00+00:00',
 			'upload_date' => '2021-01-01',
 		]);
 		$this->assertOk($response);
 
 		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
 		$this->assertOk($response);
-		$response->assertJson([
-			'config' => [],
-			'resource' => [
-				'photos' => [
-					[
-						'id' => $this->photo1->id,
-						'title' => 'new title',
-						'description' => 'new description',
-						'tags' => ['tag1'],
-						'license' => 'none',
-						'created_at' => '2021-01-01T00:00:00+00:00',
-					],
-				],
-			],
+
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.taken_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', true);
+
+		// Reset taken_at
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
+			'photo_id' => $this->photo1->id,
+			'title' => 'new title',
+			'description' => 'new description',
+			'tags' => ['tag1'],
+			'license' => 'none',
+			'taken_at' => null,
+			'upload_date' => '2021-01-01',
 		]);
+		$this->assertOk($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
+		$this->assertOk($response);
+
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', false);
+	}
+
+	public function testEditPhotoAuthorizedOwnerNullTakenDate(): void
+	{
+		DB::table('photos')->where('id', $this->photo1->id)->update(
+			['taken_at' => null, 'initial_taken_at' => null, 'taken_at_orig_tz' => null, 'initial_taken_at_orig_tz' => null]);
+
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
+			'photo_id' => $this->photo1->id,
+			'title' => 'new title',
+			'description' => 'new description',
+			'tags' => ['tag1'],
+			'license' => 'none',
+			'taken_at' => null,
+			'upload_date' => '2021-01-01',
+		]);
+		$this->assertOk($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
+		$this->assertOk($response);
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.taken_at', null);
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', false);
+
+		// Test setting taken_at
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
+			'photo_id' => $this->photo1->id,
+			'title' => 'new title',
+			'description' => 'new description',
+			'tags' => ['tag1'],
+			'license' => 'none',
+			'taken_at' => '2021-01-01T00:00:00+00:00',
+			'upload_date' => '2021-01-01',
+		]);
+		$this->assertOk($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
+		$this->assertOk($response);
+
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.taken_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', true);
+
+		// Reset taken_at
+		$response = $this->actingAs($this->userMayUpload1)->patchJson('Photo', [
+			'photo_id' => $this->photo1->id,
+			'title' => 'new title',
+			'description' => 'new description',
+			'tags' => ['tag1'],
+			'license' => 'none',
+			'taken_at' => null,
+			'upload_date' => '2021-01-01',
+		]);
+		$this->assertOk($response);
+
+		$response = $this->actingAs($this->userMayUpload1)->getJsonWithData('Album', ['album_id' => $this->album1->id]);
+		$this->assertOk($response);
+
+		$photo0 = $response->json('resource.photos.0');
+		$idx = $photo0['id'] === $this->photo1->id ? 0 : 1;
+		$response->assertJsonPath('resource.photos.' . $idx . '.id', $this->photo1->id);
+		$response->assertJsonPath('resource.photos.' . $idx . '.title', 'new title');
+		$response->assertJsonPath('resource.photos.' . $idx . '.description', 'new description');
+		$response->assertJsonPath('resource.photos.' . $idx . '.tags', ['tag1']);
+		$response->assertJsonPath('resource.photos.' . $idx . '.license', 'none');
+		$response->assertJsonPath('resource.photos.' . $idx . '.created_at', '2021-01-01T00:00:00+00:00');
+		$response->assertJsonPath('resource.photos.' . $idx . '.taken_at', null);
+		$response->assertJsonPath('resource.photos.' . $idx . '.precomputed.is_taken_at_modified', false);
 	}
 }
\ No newline at end of file