diff --git a/web/src/composables/useLogs.ts b/web/src/composables/useLogs.ts
index 299b539084..b0376506a4 100644
--- a/web/src/composables/useLogs.ts
+++ b/web/src/composables/useLogs.ts
@@ -723,7 +723,14 @@ const useLogs = () => {
           true,
           true,
         );
+
         searchObj.data.stream.selectedStreamFields = streamData.schema;
+        
+        if(!searchObj.data.stream.selectedStreamFields || searchObj.data.stream.selectedStreamFields.length == 0) {
+          searchObj.data.stream.selectedStreamFields = [];
+          searchObj.loading = false;
+          return false;
+        }
       }
 
       const streamFieldNames: any =
@@ -1063,8 +1070,6 @@ const useLogs = () => {
 
       return req;
     } catch (e: any) {
-      // showErrorNotification("Invalid SQL Syntax");
-      console.log(e);
       notificationMsg.value =
         "An error occurred while constructing the search query.";
       return "";
diff --git a/web/src/plugins/logs/Index.vue b/web/src/plugins/logs/Index.vue
index 1469116663..246216bb17 100644
--- a/web/src/plugins/logs/Index.vue
+++ b/web/src/plugins/logs/Index.vue
@@ -187,6 +187,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     enhance search.
                   </h6>
                 </div>
+                <div
+                  v-else-if="
+                    (!searchObj.data.stream.selectedStreamFields ||
+                    searchObj.data.stream.selectedStreamFields.length == 0) &&
+                    searchObj.loading == false
+                  "
+                  class="row q-mt-lg"
+                >
+                  <h6
+                    data-test="logs-search-no-stream-selected-text"
+                    class="text-center col-10 q-mx-none"
+                  >
+                    <q-icon name="info" color="primary" size="md" /> No field found in selected stream.
+                  </h6>
+                </div>
                 <div
                   v-else-if="
                     searchObj.data.queryResults.hasOwnProperty('hits') &&
diff --git a/web/src/views/RUM/SessionViewer.vue b/web/src/views/RUM/SessionViewer.vue
index b513ec8495..5d35227f73 100644
--- a/web/src/views/RUM/SessionViewer.vue
+++ b/web/src/views/RUM/SessionViewer.vue
@@ -395,13 +395,13 @@ const getDefaultEvent = (event: any) => {
 
 const handleErrorEvent = (event: any) => {
   const _event = getDefaultEvent(event);
-  _event.name = event.error_message;
+  _event.name = event?.error_message || "--";
   return _event;
 };
 
 const handleActionEvent = (event: any) => {
   const _event = getDefaultEvent(event);
-  _event.name = event.action_type + ' on "' + event.action_target_name + '"';
+  _event.name = event?.action_type + ' on "' + event?.action_target_name + '"' || "--";
   // if (event.event.custom.error) {
   //   _event.name = event.event.custom.error.message;
   // }
@@ -416,7 +416,7 @@ const handleViewEvent = (event: any) => {
   //     " error " +
   //     event.event.custom.error.stack;
   // }
-  _event.name = event.view_loading_type + " : " + event.view_url;
+  _event.name = event?.view_loading_type + " : " + event?.view_url || "--";
   return _event;
 };