diff --git a/src/routes/index.ts b/src/routes/index.ts
index 652bf9f..ed34d16 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -1,15 +1,29 @@
 import type { RequestEvent, RequestHandlerOutput } from '@sveltejs/kit'
 import { fetchAPI } from '$utils/api'
+import { getRandomItems } from '$utils/functions'
 
 export async function get({}: RequestEvent): Promise<RequestHandlerOutput> {
     try {
-        const res = await fetchAPI(`
+        // Get total of published photos
+        const totalRes = await fetchAPI(`
             query {
                 photo (
-                    limit: 11,
-                    sort: ["-date_created"],
                     filter: { status: { _eq: "published" }},
+                    limit: -1,
                 ) {
+                    id
+                }
+            }
+        `)
+        const { data: { photo: photosIds }} = totalRes
+
+        // Get random photos
+        const randomPhotosIds = [...getRandomItems(photosIds, 11)].map(({ id }) => id)
+
+        // Query these random photos from IDs
+        const photosRes = await fetchAPI(`
+            query {
+                photo (filter: { id: { _in: [${randomPhotosIds}] }}) {
                     slug
                     title
                     city
@@ -26,12 +40,13 @@ export async function get({}: RequestEvent): Promise<RequestHandlerOutput> {
                 }
             }
         `)
+        const { data: { photo: photos }} = photosRes
 
-        const { data } = res
-
-        return {
-            body: {
-                photos: data.photo
+        if (photos) {
+            return {
+                body: {
+                    photos,
+                }
             }
         }
     } catch (error) {
diff --git a/src/utils/functions/index.ts b/src/utils/functions/index.ts
index 48781cf..49160ff 100644
--- a/src/utils/functions/index.ts
+++ b/src/utils/functions/index.ts
@@ -110,6 +110,15 @@ export const getRandomItem = <T extends unknown> (array: T[]): T => {
 }
 
 
+/**
+ * Return random elements from an array
+ */
+export const getRandomItems = <T extends unknown> (array: any[], amount: number): T[] => {
+    const shuffled = Array.from(array).sort(() => 0.5 - Math.random())
+    return shuffled.slice(0, amount)
+}
+
+
 /**
  * Get a DOM element's position
  */