diff --git a/app/client/src/widgets/ListWidget/ListWidget.tsx b/app/client/src/widgets/ListWidget/ListWidget.tsx
index f933e07681..c15facfab2 100644
--- a/app/client/src/widgets/ListWidget/ListWidget.tsx
+++ b/app/client/src/widgets/ListWidget/ListWidget.tsx
@@ -11,6 +11,7 @@ import {
   isBoolean,
   omit,
   floor,
+  isEmpty,
 } from "lodash";
 import * as Sentry from "@sentry/react";
 
@@ -241,8 +242,6 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
           type: EventType.ON_ROW_SELECTED,
         },
       });
-    } else {
-      this.props.updateWidgetMetaProperty("selectedItemIndex", undefined);
     }
 
     if (!action) return;
@@ -751,7 +750,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
 
     if (
       Array.isArray(this.props.listData) &&
-      this.props.listData.length === 0 &&
+      this.props.listData.filter((item) => !isEmpty(item)).length === 0 &&
       this.props.renderMode === RenderModes.PAGE
     ) {
       return <ListComponentEmpty>No data to display</ListComponentEmpty>;