diff --git a/js/src/components/Resource/ResourceSelector.vue b/js/src/components/Resource/ResourceSelector.vue
index e1aa4acd..90ccb602 100644
--- a/js/src/components/Resource/ResourceSelector.vue
+++ b/js/src/components/Resource/ResourceSelector.vue
@@ -59,7 +59,7 @@
         {{ $t("No resources in this folder") }}
       </p>
       <b-pagination
-        v-if="resource.children.total > RESOURCES_PER_PAGE"
+        v-if="resource.children && resource.children.total > RESOURCES_PER_PAGE"
         :total="resource.children.total"
         v-model="page"
         size="is-small"
diff --git a/js/src/views/Resources/ResourceFolder.vue b/js/src/views/Resources/ResourceFolder.vue
index f2db28ef..a5889b11 100644
--- a/js/src/views/Resources/ResourceFolder.vue
+++ b/js/src/views/Resources/ResourceFolder.vue
@@ -622,8 +622,7 @@ export default class Resources extends Mixins(ResourceMixin) {
           }
           const updatedResource: IResource = data.updateResource;
 
-          // eslint-disable-next-line vue/max-len
-          oldParentCachedResource.children.elements =
+          const updatedElementList =
             oldParentCachedResource.children.elements.filter(
               (cachedResource) => cachedResource.id !== updatedResource.id
             );
@@ -634,7 +633,15 @@ export default class Resources extends Mixins(ResourceMixin) {
               path: parentPath,
               username: this.resource.actor.preferredUsername,
             },
-            data: { oldParentCachedResource },
+            data: {
+              resource: {
+                ...oldParentCachedResource,
+                children: {
+                  ...oldParentCachedResource.children,
+                  elements: [...updatedElementList],
+                },
+              },
+            },
           });
           console.log("Finished removing ressource from old parent");
 
@@ -659,15 +666,24 @@ export default class Resources extends Mixins(ResourceMixin) {
             return;
           }
 
-          newParentCachedResource.children.elements.push(resource);
-
           store.writeQuery({
             query: GET_RESOURCE,
             variables: {
               path: updatedResource.parent.path,
               username: this.resource.actor.preferredUsername,
             },
-            data: { newParentCachedResource },
+            data: {
+              resource: {
+                ...newParentCachedResource,
+                children: {
+                  ...newParentCachedResource.children,
+                  elements: [
+                    ...newParentCachedResource.children.elements,
+                    resource,
+                  ],
+                },
+              },
+            },
           });
           console.log("Finished adding resource to new parent");
         },