diff --git a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
index 8f26dd7cc..513037d11 100644
--- a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { serverClient } from "@/lib/trpc/server"
 
 import Blocks from "@/components/Blocks"
diff --git a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
index 31535ae69..24823557f 100644
--- a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { serverClient } from "@/lib/trpc/server"
 
 import Profile from "@/components/MyPages/myprofile/profile/profile"
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.tsx
index 02127d34f..daa41d09d 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { env } from "@/env/server"
 
 import TrackingSDK from "@/components/TrackingSDK"
diff --git a/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/index.tsx
index edbee226e..18439851b 100644
--- a/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/index.tsx
+++ b/apps/scandic-web/components/ContentType/DestinationPage/DestinationOverviewPage/index.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import {
   getDestinationOverviewPage,
   getDestinationsList,
diff --git a/apps/scandic-web/components/ContentType/StartPage/index.tsx b/apps/scandic-web/components/ContentType/StartPage/index.tsx
index 2051cb1ce..b43170dcc 100644
--- a/apps/scandic-web/components/ContentType/StartPage/index.tsx
+++ b/apps/scandic-web/components/ContentType/StartPage/index.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { getStartPage } from "@/lib/trpc/memoizedRequests"
 
 import Blocks from "@/components/Blocks"
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
index c55cdb9bc..1464641ea 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
@@ -33,17 +33,14 @@ export default async function Rooms({
       </div>
 
       {linkedReservations?.map((reservation, idx) => (
-        <div key={idx} className={styles.room}>
+        <div className={styles.room} key={reservation.confirmationNumber}>
           <Subtitle color="mainGrey60" type="two">
             {intl.formatMessage(
               { id: "Room {roomIndex}" },
               { roomIndex: idx + 2 }
             )}
           </Subtitle>
-          <Suspense
-            key={reservation.confirmationNumber}
-            fallback={<LinkedReservationCardSkeleton />}
-          >
+          <Suspense fallback={<LinkedReservationCardSkeleton />}>
             <LinkedReservation
               confirmationNumber={reservation.confirmationNumber}
             />
diff --git a/apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx b/apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
index 1c3cb2eaa..57e7c66fd 100644
--- a/apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
+++ b/apps/scandic-web/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
@@ -1,6 +1,5 @@
 import { differenceInCalendarDays, format, isWeekend } from "date-fns"
 import { notFound } from "next/navigation"
-import { Suspense } from "react"
 
 import { env } from "@/env/server"
 import { getCityCoordinates } from "@/lib/trpc/memoizedRequests"
diff --git a/apps/scandic-web/components/TrackingSDK/index.tsx b/apps/scandic-web/components/TrackingSDK/index.tsx
index 54928d99e..9b9caddb2 100644
--- a/apps/scandic-web/components/TrackingSDK/index.tsx
+++ b/apps/scandic-web/components/TrackingSDK/index.tsx
@@ -1,8 +1,9 @@
 "use client"
 
-import RouterTransition from "@/components/TrackingSDK/RouterTransition"
 import { trpc } from "@/lib/trpc/client"
 
+import RouterTransition from "@/components/TrackingSDK/RouterTransition"
+
 import type {
   TrackingSDKHotelInfo,
   TrackingSDKPageData,
diff --git a/apps/scandic-web/components/Webviews/AccountPage/index.tsx b/apps/scandic-web/components/Webviews/AccountPage/index.tsx
index b97a7bd66..572ea485e 100644
--- a/apps/scandic-web/components/Webviews/AccountPage/index.tsx
+++ b/apps/scandic-web/components/Webviews/AccountPage/index.tsx
@@ -1,8 +1,6 @@
 import "@/app/globals.css"
 import "@scandic-hotels/design-system/style.css"
 
-import { Suspense } from "react"
-
 import { overview } from "@/constants/routes/webviews"
 import { serverClient } from "@/lib/trpc/server"
 
diff --git a/apps/scandic-web/components/Webviews/LoyaltyPage/index.tsx b/apps/scandic-web/components/Webviews/LoyaltyPage/index.tsx
index f90be5914..b14563772 100644
--- a/apps/scandic-web/components/Webviews/LoyaltyPage/index.tsx
+++ b/apps/scandic-web/components/Webviews/LoyaltyPage/index.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { serverClient } from "@/lib/trpc/server"
 
 import MaxWidth from "@/components/MaxWidth"