2 files changed, 7 insertions, 8 deletions
diff --git a/src/site/pages/dashboard/albums/_id.vue b/src/site/pages/dashboard/albums/_id.vue
index faaf27c..446d3ac 100644
--- a/src/site/pages/dashboard/albums/_id.vue
+++ b/src/site/pages/dashboard/albums/_id.vue
@@ -76,7 +76,6 @@ export default {
 	},
 	middleware: ['auth', ({ route, store }) => {
 		store.commit('images/resetState');
-		store.dispatch('images/fetchByAlbumId', { id: route.params.id });
 	}],
 	data() {
 		return {
@@ -101,6 +100,9 @@ export default {
 	watch: {
 		current: 'fetchPaginate'
 	},
+	async asyncData({ app, params }) {
+		await app.store.dispatch('images/fetchByAlbumId', { id: params.id });
+	},
 	methods: {
 		...mapActions({
 			fetch: 'images/fetchByAlbumId'
diff --git a/src/site/pages/dashboard/albums/index.vue b/src/site/pages/dashboard/albums/index.vue
index 2ebfb3f..686edc3 100644
--- a/src/site/pages/dashboard/albums/index.vue
+++ b/src/site/pages/dashboard/albums/index.vue
@@ -55,13 +55,7 @@ export default {
 		Sidebar,
 		AlbumEntry
 	},
-	middleware: ['auth', ({ store }) => {
-		try {
-			store.dispatch('albums/fetch');
-		} catch (e) {
-			this.alert({ text: e.message, error: true });
-		}
-	}],
+	middleware: ['auth'],
 	data() {
 		return {
 			newAlbumName: null,
@@ -69,6 +63,9 @@ export default {
 		};
 	},
 	computed: mapState(['config', 'albums']),
+	async asyncData({ app }) {
+		await app.store.dispatch('albums/fetch');
+	},
 	methods: {
 		...mapActions({
 			alert: 'alert/set'