diff --git a/src/app/TopNav.vue b/src/app/TopNav.vue
index 80b6d77..6c52c15 100644
--- a/src/app/TopNav.vue
+++ b/src/app/TopNav.vue
@@ -67,7 +67,7 @@
         'showMenu',
       ]),
       scan() {
-        this.$api.scan()
+        return this.$api.scan()
       },
       logout() {
         this.$auth.logout()
diff --git a/src/library/TrackContextMenu.vue b/src/library/TrackContextMenu.vue
index 22b3fcf..38aa3c9 100644
--- a/src/library/TrackContextMenu.vue
+++ b/src/library/TrackContextMenu.vue
@@ -29,12 +29,11 @@
     },
     methods: {
       toggleStarred() {
-        if (this.starred) {
-          this.$api.unstar('track', this.track.id)
-        } else {
-          this.$api.star('track', this.track.id)
-        }
         this.starred = !this.starred
+        if (this.starred) {
+          return this.$api.unstar('track', this.track.id)
+        }
+        return this.$api.star('track', this.track.id)
       },
       setNextInQueue() {
         return this.$store.dispatch('player/setNextInQueue', this.track)
diff --git a/src/library/album/AlbumLibrary.vue b/src/library/album/AlbumLibrary.vue
index b04f1fc..2e9d5f4 100644
--- a/src/library/album/AlbumLibrary.vue
+++ b/src/library/album/AlbumLibrary.vue
@@ -54,7 +54,7 @@
     methods: {
       loadMore() {
         this.loading = true
-        this.$api.getAlbums(this.sort as AlbumSort, 50, this.offset).then(albums => {
+        return this.$api.getAlbums(this.sort as AlbumSort, 50, this.offset).then(albums => {
           this.albums.push(...albums)
           this.offset += albums.length
           this.hasMore = albums.length > 0
diff --git a/src/shared/components/InfiniteList.vue b/src/shared/components/InfiniteList.vue
index c3781b2..39676d1 100644
--- a/src/shared/components/InfiniteList.vue
+++ b/src/shared/components/InfiniteList.vue
@@ -22,7 +22,7 @@
     methods: {
       loadMore() {
         this.loading = true
-        this.load(this.offset).then((items: any[]) => {
+        return this.load(this.offset).then((items: any[]) => {
           this.items.push(...items)
           this.offset += items.length
           this.hasMore = items.length > 0