diff --git a/app/src/composables/use-items/use-items.ts b/app/src/composables/use-items/use-items.ts
index 088413af7a..c121e8f532 100644
--- a/app/src/composables/use-items/use-items.ts
+++ b/app/src/composables/use-items/use-items.ts
@@ -95,7 +95,7 @@ export function useItems(collection: Ref<string>, query: Query) {
 		if (!before || isEqual(after, before)) {
 			return;
 		}
-
+		page.value = 1;
 		await Vue.nextTick();
 		if (loading.value === false) {
 			getItems();
@@ -179,6 +179,10 @@ export function useItems(collection: Ref<string>, query: Query) {
 			items.value = fetchedItems;
 			itemCount.value = response.data.data.length;
 
+			if (fetchedItems.length === 0 && page.value !== 1) {
+				page.value = 1;
+			}
+
 			if (response.data.data.length === limit.value || page.value > 1) {
 				getItemCount();
 			}