diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index c8cc61314e..df34a41e54 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -17,9 +17,14 @@ class AssetService {
        _localAssetRepository = localAssetRepository,
        _platform = const LocalPlatform();
 
+  Future<BaseAsset?> getAsset(BaseAsset asset) {
+    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
+    return asset is LocalAsset ? _localAssetRepository.get(id) : _remoteAssetRepository.get(id);
+  }
+
   Stream<BaseAsset?> watchAsset(BaseAsset asset) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset ? _localAssetRepository.watchAsset(id) : _remoteAssetRepository.watchAsset(id);
+    return asset is LocalAsset ? _localAssetRepository.watch(id) : _remoteAssetRepository.watch(id);
   }
 
   Future<RemoteAsset?> getRemoteAsset(String id) {
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 58adac30db..5865447064 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -9,7 +9,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftLocalAssetRepository(this._db) : super(_db);
 
-  Stream<LocalAsset?> watchAsset(String id) {
+  SingleOrNullSelectable<LocalAsset?> _assetSelectable(String id) {
     final query = _db.localAssetEntity.select().addColumns([_db.remoteAssetEntity.id]).join([
       leftOuterJoin(
         _db.remoteAssetEntity,
@@ -21,9 +21,13 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     return query.map((row) {
       final asset = row.readTable(_db.localAssetEntity).toDto();
       return asset.copyWith(remoteId: row.read(_db.remoteAssetEntity.id));
-    }).watchSingleOrNull();
+    });
   }
 
+  Future<LocalAsset?> get(String id) => _assetSelectable(id).getSingleOrNull();
+
+  Stream<LocalAsset?> watch(String id) => _assetSelectable(id).watchSingleOrNull();
+
   Future<void> updateHashes(Iterable<LocalAsset> hashes) {
     if (hashes.isEmpty) {
       return Future.value();
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 44d7cfb6bb..3ed7dddfe8 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -55,24 +55,6 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     return _assetSelectable(id).getSingleOrNull();
   }
 
-  Stream<RemoteAsset?> watchAsset(String id) {
-    final query =
-        _db.remoteAssetEntity.select().addColumns([_db.localAssetEntity.id]).join([
-            leftOuterJoin(
-              _db.localAssetEntity,
-              _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
-              useColumns: false,
-            ),
-          ])
-          ..where(_db.remoteAssetEntity.id.equals(id))
-          ..limit(1);
-
-    return query.map((row) {
-      final asset = row.readTable(_db.remoteAssetEntity).toDto();
-      return asset.copyWith(localId: row.read(_db.localAssetEntity.id));
-    }).watchSingleOrNull();
-  }
-
   Future<List<RemoteAsset>> getStackChildren(RemoteAsset asset) {
     if (asset.stackId == null) {
       return Future.value([]);
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
index 32510c2ca5..fa7f204596 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -87,9 +87,10 @@ class NativeVideoViewer extends HookConsumerWidget {
         return null;
       }
 
+      final videoAsset = await ref.read(assetServiceProvider).getAsset(asset) ?? asset;
       try {
-        if (asset.hasLocal && asset.livePhotoVideoId == null) {
-          final id = asset is LocalAsset ? (asset as LocalAsset).id : (asset as RemoteAsset).localId!;
+        if (videoAsset.hasLocal && videoAsset.livePhotoVideoId == null) {
+          final id = videoAsset is LocalAsset ? videoAsset.id : (videoAsset as RemoteAsset).localId!;
           final file = await const StorageRepository().getFileForAsset(id);
           if (file == null) {
             throw Exception('No file found for the video');
@@ -99,14 +100,14 @@ class NativeVideoViewer extends HookConsumerWidget {
           return source;
         }
 
-        final remoteId = (asset as RemoteAsset).id;
+        final remoteId = (videoAsset as RemoteAsset).id;
 
         // Use a network URL for the video player controller
         final serverEndpoint = Store.get(StoreKey.serverEndpoint);
         final isOriginalVideo = ref.read(settingsProvider).get<bool>(Setting.loadOriginalVideo);
         final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
-        final String videoUrl = asset.livePhotoVideoId != null
-            ? '$serverEndpoint/assets/${asset.livePhotoVideoId}/$postfixUrl'
+        final String videoUrl = videoAsset.livePhotoVideoId != null
+            ? '$serverEndpoint/assets/${videoAsset.livePhotoVideoId}/$postfixUrl'
             : '$serverEndpoint/assets/$remoteId/$postfixUrl';
 
         final source = await VideoSource.init(
@@ -116,7 +117,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         );
         return source;
       } catch (error) {
-        log.severe('Error creating video source for asset ${asset.name}: $error');
+        log.severe('Error creating video source for asset ${videoAsset.name}: $error');
         return null;
       }
     }