diff --git a/src/routes/price-alert/+page.svelte b/src/routes/price-alert/+page.svelte
index 40567bc7..ce9d1149 100644
--- a/src/routes/price-alert/+page.svelte
+++ b/src/routes/price-alert/+page.svelte
@@ -30,7 +30,7 @@
   let displayList = [];
   let editMode = false;
   let numberOfChecked = 0;
-  let priceAlertList = data?.getPriceAlert?.data;
+  let priceAlertList = data?.getPriceAlert?.data || [];
 
   let deletePriceAlertList = [];
   let news = data?.getPriceAlert?.news || [];
@@ -748,52 +748,48 @@
                 {/if}
               </div>
             {/if}
+          {/if}
+          {#if priceAlertList?.length === 0}
+            <div class="flex flex-col justify-center items-center m-auto mt-14">
+              <span class="text-white font-bold text-white text-xl sm:text-3xl">
+                No Alerts set
+              </span>
 
-            {#if priceAlertList?.length === 0}
-              <div
-                class="flex flex-col justify-center items-center m-auto mt-14"
+              <span
+                class="text-white text-sm sm:text-[1rem] m-auto p-4 text-center"
               >
-                <span
-                  class="text-white font-bold text-white text-xl sm:text-3xl"
-                >
-                  No Alerts set
-                </span>
+                Create price alerts for your stocks that have the most potential
+                in your opinion.
+              </span>
 
-                <span
-                  class="text-white text-sm sm:text-[1rem] m-auto p-4 text-center"
+              {#if !data?.user}
+                <a
+                  class="w-64 flex mt-10 justify-center items-center m-auto btn text-black bg-[#fff] sm:hover:bg-gray-300 transition duration-150 ease-in-out group"
+                  href="/register"
                 >
-                  Create price alerts for your stocks that have the most
-                  potential in your opinion.
-                </span>
-                {#if !data?.user}
-                  <a
-                    class="w-64 flex mt-10 justify-center items-center m-auto btn text-white bg-[#fff] sm:hover:bg-gray-300 transition duration-150 ease-in-out group"
-                    href="/register"
+                  Get Started
+                  <span
+                    class="tracking-normal group-hover:translate-x-0.5 transition-transform duration-150 ease-in-out"
                   >
-                    Get Started
-                    <span
-                      class="tracking-normal group-hover:translate-x-0.5 transition-transform duration-150 ease-in-out"
+                    <svg
+                      class="w-4 h-4"
+                      xmlns="http://www.w3.org/2000/svg"
+                      viewBox="0 0 24 24"
+                      ><g transform="rotate(90 12 12)"
+                        ><g fill="none"
+                          ><path
+                            d="M24 0v24H0V0h24ZM12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035c-.01-.004-.019-.001-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427c-.002-.01-.009-.017-.017-.018Zm.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093c.012.004.023 0 .029-.008l.004-.014l-.034-.614c-.003-.012-.01-.02-.02-.022Zm-.715.002a.023.023 0 0 0-.027.006l-.006.014l-.034.614c0 .012.007.02.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01l-.184-.092Z"
+                          /><path
+                            fill="black"
+                            d="M13.06 3.283a1.5 1.5 0 0 0-2.12 0L5.281 8.939a1.5 1.5 0 0 0 2.122 2.122L10.5 7.965V19.5a1.5 1.5 0 0 0 3 0V7.965l3.096 3.096a1.5 1.5 0 1 0 2.122-2.122L13.06 3.283Z"
+                          /></g
+                        ></g
+                      ></svg
                     >
-                      <svg
-                        class="w-4 h-4"
-                        xmlns="http://www.w3.org/2000/svg"
-                        viewBox="0 0 24 24"
-                        ><g transform="rotate(90 12 12)"
-                          ><g fill="none"
-                            ><path
-                              d="M24 0v24H0V0h24ZM12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035c-.01-.004-.019-.001-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427c-.002-.01-.009-.017-.017-.018Zm.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093c.012.004.023 0 .029-.008l.004-.014l-.034-.614c-.003-.012-.01-.02-.02-.022Zm-.715.002a.023.023 0 0 0-.027.006l-.006.014l-.034.614c0 .012.007.02.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01l-.184-.092Z"
-                            /><path
-                              fill="white"
-                              d="M13.06 3.283a1.5 1.5 0 0 0-2.12 0L5.281 8.939a1.5 1.5 0 0 0 2.122 2.122L10.5 7.965V19.5a1.5 1.5 0 0 0 3 0V7.965l3.096 3.096a1.5 1.5 0 1 0 2.122-2.122L13.06 3.283Z"
-                            /></g
-                          ></g
-                        ></svg
-                      >
-                    </span>
-                  </a>
-                {/if}
-              </div>
-            {/if}
+                  </span>
+                </a>
+              {/if}
+            </div>
           {/if}
         </main>