diff --git a/app/__test-fixtures__/contextTestHelpers.tsx b/app/__test-fixtures__/contextTestHelpers.tsx
index 340ec6a71..69f1aa993 100644
--- a/app/__test-fixtures__/contextTestHelpers.tsx
+++ b/app/__test-fixtures__/contextTestHelpers.tsx
@@ -214,7 +214,7 @@ const datastoreConnectionContext = {
   connect: jest.fn(),
   disconnect: jest.fn(),
   dbAccessToken: "token",
-  dbAccessTokenStatus: "idle" as DbAuthTokenStatus,
+  dbAccessTokenStatus: "connected" as DbAuthTokenStatus,
   did: jest.fn() as any,
   checkSessionIsValid: jest.fn().mockImplementation(() => true),
 };
diff --git a/app/components/LoadingScreen.tsx b/app/components/LoadingScreen.tsx
index 9ff4c07ad..2fffbf893 100644
--- a/app/components/LoadingScreen.tsx
+++ b/app/components/LoadingScreen.tsx
@@ -1,10 +1,9 @@
 import React from "react";
 
-const LoadingScreen = () => {
+const LoadingScreen = ({ className }: { className?: string }) => {
   return (
-    <div className="flex h-1/2 flex-col place-content-center text-center text-3xl text-color-2">
-      Loading...
-      <img className="mt-2 h-12 animate-bounce" src={"/assets/passportLogoWhite.svg"} alt="Gitcoin Logo" />
+    <div className="flex h-full flex-col place-content-center">
+      <img className={`h-80 ${className}`} src={"/assets/loadingSpinner.svg"} alt="Loading Spinner" />
     </div>
   );
 };
diff --git a/app/pages/Dashboard.tsx b/app/pages/Dashboard.tsx
index dcfcc8bbb..dd62677d8 100644
--- a/app/pages/Dashboard.tsx
+++ b/app/pages/Dashboard.tsx
@@ -45,6 +45,7 @@ import hash from "object-hash";
 // --- GTM Module
 import TagManager from "react-gtm-module";
 import { useDatastoreConnectionContext } from "../context/datastoreConnectionContext";
+import LoadingScreen from "../components/LoadingScreen";
 
 const success = "../../assets/check-icon2.svg";
 const fail = "../assets/verification-failed-bright.svg";
@@ -307,31 +308,35 @@ export default function Dashboard() {
       <HeaderContentFooterGrid>
         <Header />
         <BodyWrapper className="mt-4 md:mt-6">
-          <PageWidthGrid>
-            <Subheader className={` ${useCustomDashboardPanel ? "col-span-full" : "col-span-7"}`} />
-            {useCustomDashboardPanel ? (
-              <DynamicCustomDashboardPanel className="col-start-1 col-end-[-1] xl:col-start-8 row-span-2 mt-6" />
-            ) : (
-              <DashboardIllustration className="col-span-5 row-span-5 hidden xl:block" />
-            )}
-            <DashboardScorePanel className="col-span-full xl:col-span-7" />
-
-            <span className="col-start-1 col-end-12 font-heading text-4xl">Add Stamps</span>
-            <CardList
-              className="col-span-full"
-              isLoading={
-                isLoadingPassport == IsLoadingPassportState.Loading ||
-                isLoadingPassport == IsLoadingPassportState.CreatingPassport ||
-                isLoadingPassport == IsLoadingPassportState.FailedToConnect
-              }
-            />
-            <span className="col-start-1 col-end-4 font-heading text-3xl">Add Collected Stamps</span>
-            <span className="col-end-[-1] self-center whitespace-nowrap text-right font-alt text-3xl text-foreground-2">
-              {numVerifiedPlatforms}/{numPlatforms}
-            </span>
-            <DashboardValidStampsPanel className="col-span-full" />
-            <ExpiredStampsPanel className="col-span-full" />
-          </PageWidthGrid>
+          {dbAccessTokenStatus === "connected" ? (
+            <PageWidthGrid>
+              <Subheader className={` ${useCustomDashboardPanel ? "col-span-full" : "col-span-7"}`} />
+              {useCustomDashboardPanel ? (
+                <DynamicCustomDashboardPanel className="col-start-1 col-end-[-1] xl:col-start-8 row-span-2 mt-6" />
+              ) : (
+                <DashboardIllustration className="col-span-5 row-span-5 hidden xl:block" />
+              )}
+              <DashboardScorePanel className="col-span-full xl:col-span-7" />
+
+              <span className="col-start-1 col-end-12 font-heading text-4xl">Add Stamps</span>
+              <CardList
+                className="col-span-full"
+                isLoading={
+                  isLoadingPassport == IsLoadingPassportState.Loading ||
+                  isLoadingPassport == IsLoadingPassportState.CreatingPassport ||
+                  isLoadingPassport == IsLoadingPassportState.FailedToConnect
+                }
+              />
+              <span className="col-start-1 col-end-4 font-heading text-3xl">Add Collected Stamps</span>
+              <span className="col-end-[-1] self-center whitespace-nowrap text-right font-alt text-3xl text-foreground-2">
+                {numVerifiedPlatforms}/{numPlatforms}
+              </span>
+              <DashboardValidStampsPanel className="col-span-full" />
+              <ExpiredStampsPanel className="col-span-full" />
+            </PageWidthGrid>
+          ) : (
+            <LoadingScreen />
+          )}
         </BodyWrapper>
         {/* This footer contains dark colored text and dark images */}
         <WelcomeFooter displayPrivacyPolicy={false} fixed={false} />
diff --git a/app/pages/Welcome.tsx b/app/pages/Welcome.tsx
index d58ac4c4b..175851a20 100644
--- a/app/pages/Welcome.tsx
+++ b/app/pages/Welcome.tsx
@@ -53,7 +53,7 @@ export default function Welcome() {
               hasPassports={(passport && passport.stamps.length > 0) || false}
             />
           ) : (
-            <LoadingScreen />
+            <LoadingScreen className="mb-20" />
           )}
         </BodyWrapper>
         <WelcomeFooter displayPrivacyPolicy={true} fixed={true} />
diff --git a/app/public/assets/loadingSpinner.svg b/app/public/assets/loadingSpinner.svg
new file mode 100644
index 000000000..5b0318838
--- /dev/null
+++ b/app/public/assets/loadingSpinner.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Keyshape -->
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 300 300" style="background: rgba(0,0,0,0.00); white-space: preserve-spaces;">
+    <style>
+@keyframes outter_t { 0% { transform: translate(150px,150px) rotate(0deg) translate(-165.1px,-188.844px); animation-timing-function: cubic-bezier(0.77,0,0.175,1); } 66.6666% { transform: translate(150px,150px) rotate(60deg) translate(-165.1px,-188.844px); } 100% { transform: translate(150px,150px) rotate(60deg) translate(-165.1px,-188.844px); } }
+    </style>
+    <path id="outter" d="M161.412,312.24L60.0501,253.755C57.7449,252.437,56.3617,250,56.3617,247.367L56.3617,130.329C56.3617,127.695,57.7449,125.258,60.0501,123.941L161.412,65.4553C163.717,64.1381,166.483,64.1381,168.788,65.4553L270.15,123.941C272.456,125.258,273.838,127.695,273.838,130.329L273.838,247.3C273.838,249.935,272.456,252.372,270.15,253.69L168.788,312.174C166.483,313.558,163.651,313.558,161.412,312.24ZM78.4914,243.085L161.412,290.967C163.717,292.284,166.483,292.284,168.788,290.967L251.708,243.085C254.014,241.768,255.397,239.331,255.397,236.697L255.397,140.999C255.397,138.364,254.014,135.928,251.708,134.611L168.723,86.7288C166.417,85.4115,163.651,85.4115,161.346,86.7288L78.4914,134.611C76.1862,135.928,74.8031,138.364,74.8031,140.999L74.8031,236.697C74.8031,239.331,76.1862,241.768,78.4914,243.085Z" fill="#c1f6ff" stroke="none" stroke-width="0" fill-opacity="1" transform="translate(150,150) translate(-165.1,-188.844)" style="animation: 1.5s linear infinite both outter_t;"/>
+    <path id="inner" d="M161.412,103.655L93.1786,143.04C90.8735,144.358,89.4904,146.795,89.4904,149.43L89.4904,223.985C89.4904,229.254,92.3224,234.128,96.8669,236.763L105.166,241.571C106.417,242.295,107.932,241.373,107.932,239.99L107.932,160.1C107.932,157.465,109.315,155.028,111.62,153.71L161.412,124.994C163.717,123.678,166.483,123.678,168.788,124.994L218.58,153.71C220.885,155.028,222.268,157.465,222.268,160.1L222.268,217.597C222.268,220.231,220.885,222.668,218.58,223.985L168.788,252.701C166.483,254.018,163.717,254.018,161.412,252.701L144.815,243.151C142.509,241.834,141.126,239.397,141.126,236.763L141.126,179.265C141.126,176.631,142.509,174.194,144.815,172.876L161.412,163.327C163.717,162.009,166.483,162.009,168.788,163.327L185.385,172.876C187.691,174.194,189.074,176.631,189.074,179.265L189.074,198.431C189.074,201.065,187.691,203.502,185.385,204.82L177.087,209.627C175.835,210.352,174.321,209.43,174.321,208.047L174.321,187.959C174.321,185.324,172.937,182.887,170.633,181.57L166.945,179.462C165.825,178.804,164.375,178.804,163.255,179.462L158.645,182.097C156.933,183.085,155.879,184.929,155.879,186.905L155.879,228.398C155.879,231.032,157.328,233.469,159.567,234.787L161.346,235.775C163.651,237.092,166.417,237.092,168.723,235.775L203.827,215.489C206.132,214.172,207.515,211.735,207.515,209.1L207.515,168.661C207.515,166.027,206.132,163.59,203.827,162.273L168.788,142.053C166.483,140.736,163.717,140.736,161.412,142.053L126.373,162.273C124.068,163.59,122.685,166.027,122.685,168.661L122.685,247.432C122.685,250.067,124.068,252.504,126.373,253.821L161.412,274.04C163.717,275.358,166.483,275.358,168.788,274.04L237.022,234.655C239.326,233.338,240.71,230.901,240.71,228.266L240.71,149.43C240.71,146.795,239.326,144.358,237.022,143.04L168.788,103.655C166.483,102.338,163.651,102.338,161.412,103.655L161.412,103.655Z" fill="#c1f6ff" stroke="none" stroke-width="2" fill-opacity="1" transform="translate(150,150) translate(-165.1,-188.844)"/>
+</svg>