diff --git a/app/client/src/widgets/TableWidget/widget/index.tsx b/app/client/src/widgets/TableWidget/widget/index.tsx index a878415357..6ffdcb5f56 100644 --- a/app/client/src/widgets/TableWidget/widget/index.tsx +++ b/app/client/src/widgets/TableWidget/widget/index.tsx @@ -324,7 +324,7 @@ class TableWidget extends BaseWidget { } catch (e) { isValidDate = false; } - if (isValidDate) { + if (isValidDate && value) { try { if (outputFormat === "SAME_AS_INPUT") { outputFormat = inputFormat; @@ -684,6 +684,7 @@ class TableWidget extends BaseWidget { applyFilters = (filters: ReactTableFilter[]) => { this.resetSelectedRowIndex(); this.props.updateWidgetMetaProperty("filters", filters); + this.props.updateWidgetMetaProperty("pageNo", 1); }; toggleDrag = (disable: boolean) => {