diff --git a/ui/src/components/shared/SearchBar.tsx b/ui/src/components/shared/SearchBar.tsx
index 2dea90ca1..a50d10a71 100644
--- a/ui/src/components/shared/SearchBar.tsx
+++ b/ui/src/components/shared/SearchBar.tsx
@@ -5,11 +5,13 @@ import { getSearchUrl } from "@/utils/utils";
 
 interface SearchBarProps {
   placeholder?: string;
+  hide?: boolean;
   className?: string;
 }
 
 const SearchBar: React.FC<SearchBarProps> = ({
   placeholder = "Search",
+  hide = false,
   className,
 }) => {
   const router = useRouter();
@@ -20,14 +22,18 @@ const SearchBar: React.FC<SearchBarProps> = ({
   const { Search } = Input;
 
   return (
-    <Search
-      onSearch={() => router.push(getSearchUrl({ search: val }, true))}
-      placeholder={placeholder}
-      enterButton
-      className={className}
-      value={val}
-      onChange={(e) => setVal(e?.target?.value)}
-    />
+    <>
+      {!hide && (
+        <Search
+          onSearch={() => router.push(getSearchUrl({ search: val }, true))}
+          placeholder={placeholder}
+          enterButton
+          className={className}
+          value={val}
+          onChange={(e) => setVal(e?.target?.value)}
+        />
+      )}
+    </>
   );
 };
 
diff --git a/ui/src/pages/index.tsx b/ui/src/pages/index.tsx
index 9efa17ed3..69807b9c9 100644
--- a/ui/src/pages/index.tsx
+++ b/ui/src/pages/index.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Tabs } from "antd";
+import { Tabs, Empty } from "antd";
 import Image from "next/image";
 import { GetServerSideProps } from "next";
 
@@ -15,8 +15,12 @@ interface HomePageProps {
 }
 
 const HomePage: React.FC<HomePageProps> = ({ count, facets, query }) => {
-  const journals: Journal[] = facets?._filter_journal?.journal?.buckets;
-  const partners: Country[] = facets?._filter_country?.country?.buckets;
+  const journals: Journal[] = facets
+    ? facets?._filter_journal?.journal?.buckets
+    : [];
+  const partners: Country[] = facets
+    ? facets?._filter_country?.country?.buckets
+    : [];
 
   const tabItems = [
     {
@@ -48,10 +52,15 @@ const HomePage: React.FC<HomePageProps> = ({ count, facets, query }) => {
             Search <b>{count} Open Access</b> articles:
           </p>
           <SearchBar
+            hide={count == 0}
             placeholder="Type and press enter to search"
             className="home-searchbar mb-6"
           />
-          <Tabs type="card" items={tabItems} />
+          {journals.length > 0 || partners.length > 0 ? (
+            <Tabs type="card" items={tabItems} />
+          ) : (
+            <Empty />
+          )}
         </div>
       </div>
     </>
@@ -60,11 +69,11 @@ const HomePage: React.FC<HomePageProps> = ({ count, facets, query }) => {
 
 export const getServerSideProps: GetServerSideProps = async () => {
   const query = { search: "" };
-
   const res = await fetch(`${getApiUrl() + getSearchUrl(query)}`, authToken);
   const { count, facets } = (await res?.json()) as Response;
-
-  return { props: { count, facets, query } };
+  const countValue = { count: count || 0 };
+  const facetsValue = { facets: facets || null };
+  return { props: Object.assign(countValue, facetsValue, query) };
 };
 
 export default HomePage;