diff --git a/src/page/Dashboard/Filters.js b/src/page/Dashboard/Filters.js
index dd9919a6..ff8975f5 100644
--- a/src/page/Dashboard/Filters.js
+++ b/src/page/Dashboard/Filters.js
@@ -73,7 +73,7 @@ export default function Filters({
         <div className="flex flex-col mx-4 my-2"> 
           <div className="flex"> 
             <SearchableDropdown 
-              data={schema?.fields.filter( 
+              data={schema?.fields?.filter( 
                 (field) => 
                   field.name !== "p_metadata" && field.name !== "p_tags" 
               )} 
diff --git a/src/page/Dashboard/Table.js b/src/page/Dashboard/Table.js
index 9a7c4ec6..4a43c47c 100644
--- a/src/page/Dashboard/Table.js
+++ b/src/page/Dashboard/Table.js
@@ -23,12 +23,13 @@ const Table = ({
   addAvailableMeta,
   selectedMeta,
   selectedFilters,
+  hideError,
 }) => {
   function filterCheck(data) {
     if (!selectedFilters.length) {
       return true;
     }
-    
+
     for (const filter of selectedFilters) {
       const column = filter.column;
       const query =
@@ -74,7 +75,7 @@ const Table = ({
               >
                 <BeatLoader
                   color={"#1A237E"}
-                  loading={logQueries.isLoading}
+                  loading={logQueries.isFetching}
                   cssOverride={{
                     display: "block",
                     margin: "0 auto",
@@ -88,6 +89,8 @@ const Table = ({
         ) : (
           <tbody className="divide-y divide-gray-200 bg-white">
             {logQueries?.data?.pages?.map &&
+            logQueries.data.pages.length &&
+            logQueries.data.pages[0].data.length ? (
               logQueries.data.pages.map(
                 (page) =>
                   page?.data?.map &&
@@ -124,7 +127,19 @@ const Table = ({
                         </tr>
                       )
                   )
-              )}
+              )
+            ) : hideError ? (
+              <></>
+            ) : (
+              <tr align={"center"}>
+                <td
+                  colSpan={selectedLogSchema.length}
+                  className="py-4 justify-center font-medium text-gray-700"
+                >
+                  No data found
+                </td>
+              </tr>
+            )}
             <tr align={"center"}>
               <td
                 colSpan={selectedLogSchema.length}
diff --git a/src/page/Dashboard/index.js b/src/page/Dashboard/index.js
index 8f4f91e1..a15cff9f 100644
--- a/src/page/Dashboard/index.js
+++ b/src/page/Dashboard/index.js
@@ -112,15 +112,19 @@ const Dashboard = () => {
     enabled: Boolean(selectedLogStream?.name != null),
     refetchOnWindowFocus: false,
     onSuccess: (data) => {
-      const allFields = data.data.fields.map((field) => {
-        return field.name;
-      });
+      if (data.data.fields) {
+        const allFields = data.data.fields.map((field) => {
+          return field.name;
+        });
 
-      setSelectedLogSchema([
-        ...allFields.filter(
-          (field) => field !== "p_metadata" && field !== "p_tags"
-        ),
-      ]);
+        setSelectedLogSchema([
+          ...allFields.filter(
+            (field) => field !== "p_metadata" && field !== "p_tags"
+          ),
+        ]);
+      } else {
+        setSelectedLogSchema([]);
+      }
     },
   });
 
@@ -141,9 +145,11 @@ const Dashboard = () => {
     {
       retry: false,
       enabled:
-        Boolean(logStreamSchema?.data?.data?.fields?.map((field) => {
+        Boolean(
+          logStreamSchema?.data?.data?.fields?.map((field) => {
             return field.name;
-          })?.length !== 0) && Boolean(selectedLogStream?.name != null),
+          })?.length !== 0
+        ) && Boolean(selectedLogStream?.name != null),
       refetchOnWindowFocus: false,
       refetchInterval:
         interval === null || range === 7 ? false : interval * 1000,
@@ -273,6 +279,11 @@ const Dashboard = () => {
             addAvailableMeta={addAvailableMeta}
             selectedMeta={selectedMeta}
             selectedFilters={selectedFilters}
+            hideError={
+              logStreamSchema.isError ||
+              logStream.isError ||
+              !logStreamSchema?.data?.data
+            }
           />
         </div>
 
@@ -280,7 +291,7 @@ const Dashboard = () => {
         (logStream.isError || !logStream?.data?.data.length) ? (
           <div
             style={{ transform: "translateX(-50%) translateY(-50%)" }}
-            className="absolute -z-10 font-semibold text-gray-500 left-1/2 top-80"
+            className="absolute font-semibold text-gray-500 left-1/2 top-80"
           >
             Please create a log stream first to search logs. Refer to the
             documentation{" "}
@@ -297,6 +308,30 @@ const Dashboard = () => {
         ) : (
           <></>
         )}
+
+        {!logStreamSchema.isLoading &&
+        !logStreamSchema.isFetching &&
+        (logStreamSchema.isError || !logStreamSchema?.data?.data) ? (
+          <div
+            style={{ transform: "translateX(-50%) translateY(-50%)" }}
+            className="absolute font-semibold text-gray-500 left-1/2 top-80"
+          >
+            <p>
+              No schema for the stream found. Refer to the documentation{" "}
+              <a
+                rel="noreferrer"
+                target={"_blank"}
+                className="text-blue-500 hover:underline"
+                href="https://www.parseable.io/docs/introduction"
+              >
+                here
+              </a>
+            </p>
+            .
+          </div>
+        ) : (
+          <></>
+        )}
       </div>
 
       <SideDialog open={open} setOpen={setOpen} data={clickedRow} />
diff --git a/src/page/Login/index.js b/src/page/Login/index.js
index 454d399b..1c283d54 100644
--- a/src/page/Login/index.js
+++ b/src/page/Login/index.js
@@ -98,7 +98,9 @@ const Login = () => {
             </button>
             {logStream.isError && (
               <p className="text-red-600 text-center mt-1">
-                {"logStream.error"}
+                {logStream.error.request.status === 401
+                  ? "Invalid credential"
+                  : "Request failed"}
               </p>
             )}
           </form>
diff --git a/src/utils/api/query.js b/src/utils/api/query.js
index 7e47919a..4948014a 100644
--- a/src/utils/api/query.js
+++ b/src/utils/api/query.js
@@ -21,7 +21,6 @@ const queryLogs = (
       dateStream = logSchema[index];
     }
   }
-
   return post(
     QUERY_URL,
     {