diff --git a/pages/links/index.tsx b/pages/links/index.tsx
index 582e9620..fef20676 100644
--- a/pages/links/index.tsx
+++ b/pages/links/index.tsx
@@ -51,6 +51,9 @@ export default function Index() {
           />
         </LinkListOptions>
 
+        {!data.isLoading && links && !links[0] && (
+          <NoLinksFound text={t("you_have_not_added_any_links")} />
+        )}
         <Links
           editMode={editMode}
           links={links}
@@ -58,9 +61,6 @@ export default function Index() {
           placeholderCount={1}
           useData={data}
         />
-        {!data.isLoading && links && !links[0] && (
-          <NoLinksFound text={t("you_have_not_added_any_links")} />
-        )}
       </div>
     </MainLayout>
   );
diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx
index 9d1fb53d..9eaf8e2a 100644
--- a/pages/links/pinned.tsx
+++ b/pages/links/pinned.tsx
@@ -46,13 +46,6 @@ export default function PinnedLinks() {
           />
         </LinkListOptions>
 
-        <Links
-          editMode={editMode}
-          links={links}
-          layout={viewMode}
-          placeholderCount={1}
-          useData={data}
-        />
         {!data.isLoading && links && !links[0] && (
           <div
             style={{ flex: "1 1 auto" }}
@@ -74,6 +67,13 @@ export default function PinnedLinks() {
             </p>
           </div>
         )}
+        <Links
+          editMode={editMode}
+          links={links}
+          layout={viewMode}
+          placeholderCount={1}
+          useData={data}
+        />
       </div>
     </MainLayout>
   );
diff --git a/pages/search.tsx b/pages/search.tsx
index e6282686..f8a14238 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -73,27 +73,7 @@ export default function Search() {
           <PageHeader icon={"bi-search"} title={"Search Results"} />
         </LinkListOptions>
 
-        {/* {
-        !isLoading && 
-        !links[0] ? (
-          <p>{t("nothing_found")}</p>
-        ) : links[0] ? (
-          <LinkComponent
-            editMode={editMode}
-            links={links}
-            isLoading={isLoading}
-          />
-        ) : (
-          isLoading && (
-            <GridLoader
-              color="oklch(var(--p))"
-              loading={true}
-              size={20}
-              className="m-auto py-10"
-            />
-          )
-        )} */}
-
+        {!data.isLoading && links && !links[0] && <p>{t("nothing_found")}</p>}
         <Links
           editMode={editMode}
           links={links}