diff --git a/resources/js/components/Others/ThumbnailItem.vue b/resources/js/components/Others/ThumbnailItem.vue
index dbf237e1..02b6fa60 100644
--- a/resources/js/components/Others/ThumbnailItem.vue
+++ b/resources/js/components/Others/ThumbnailItem.vue
@@ -24,7 +24,7 @@
             <!--File Icon-->
             <FileIconThumbnail
                 v-if="isFile || isVideo || isAudio || (isImage && !item.data.attributes.thumbnail)"
-                :item="item"
+                :entry="item"
                 class="pr-2"
             />
 
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index f5941b86..3c669f09 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -152,7 +152,10 @@ const mutations = {
     UPDATE_SHARED_ITEM(state, data) {
         state.entries.find((item) => {
             if (item.data.id === data.data.attributes.item_id) {
-                item.data.relationships.shared = data
+                item.data.relationships = {
+                    ...item.data.relationships,
+                    ...{shared: data}
+                }
             }
         })
     },
diff --git a/resources/js/views/FileView/SharedWithMe.vue b/resources/js/views/FileView/SharedWithMe.vue
index 7fca9535..a469f568 100644
--- a/resources/js/views/FileView/SharedWithMe.vue
+++ b/resources/js/views/FileView/SharedWithMe.vue
@@ -238,7 +238,6 @@ export default {
         },
     },
     mounted() {
-        this.$store.commit('SET_CURRENT_TEAM_FOLDER', undefined)
         this.$store.dispatch('getSharedWithMeFolder', this.$route.params.id)
 
         events.$on('context-menu:show', (event, item) => (this.item = item))
diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php
index 532e72a9..1bbc79d6 100644
--- a/src/Domain/Teams/Controllers/TeamFoldersController.php
+++ b/src/Domain/Teams/Controllers/TeamFoldersController.php
@@ -55,7 +55,7 @@ class TeamFoldersController extends Controller
         // Collect folders and files to single array
         return [
             'folders'    => new FolderCollection($folders),
-            'files'      => isset($files) ? new FilesCollection($files) : [],
+            'files'      => isset($files) ? new FilesCollection($files) : new FilesCollection([]),
             'root'       => $id ? new FolderResource(Folder::findOrFail($id)) : null,
             'teamFolder' => $id ? new FolderResource(Folder::findOrFail($id)->getLatestParent()) : null,
         ];