diff --git a/mobile/lib/pages/common/album_viewer.page.dart b/mobile/lib/pages/common/album_viewer.page.dart
index 33b314f3b105b..ea3f588922569 100644
--- a/mobile/lib/pages/common/album_viewer.page.dart
+++ b/mobile/lib/pages/common/album_viewer.page.dart
@@ -242,6 +242,7 @@ class AlbumViewerPage extends HookConsumerWidget {
               ),
               onRemoveFromAlbum: onRemoveFromAlbumPressed,
               editEnabled: data.ownerId == userId,
+              stackEnabled: data.ownerId == userId,
             ),
           ),
           AnimatedPositioned(
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index b12847ee62537..36842f5ff6532 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -185,7 +185,7 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
     hasSharedLink,
     startDate,
     endDate,
-    assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth })),
+    assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth, withStack: true })),
     assetCount: entity.assets?.length || 0,
     isActivityEnabled: entity.isActivityEnabled,
     order: entity.order,
diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts
index f7b4cb44aa976..a2a37c8edde85 100644
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -46,6 +46,7 @@ export class AlbumRepository implements IAlbumRepository {
     if (options.withAssets) {
       relations.assets = {
         exifInfo: true,
+        stack: { assets: true },
       };
 
       order.assets = {