diff --git a/.version b/.version
index d2d61a7e8e..b966e81a45 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.2.2
\ No newline at end of file
+1.2.4
\ No newline at end of file
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index 04c904b9d7..df196e7d53 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -49,10 +49,12 @@ export function Table({
 
   const actions = component.definition.properties.actions || { value: [] };
   const serverSidePaginationProperty = component.definition.properties.serverSidePagination;
-  const serverSidePagination = serverSidePaginationProperty
+  let serverSidePagination = serverSidePaginationProperty
     ? resolveWidgetFieldValue(serverSidePaginationProperty.value, currentState)
     : false;
 
+  if (typeof serverSidePagination !== 'boolean') serverSidePagination = false;
+
   const serverSideSearchProperty = component.definition.properties.serverSideSearch;
   const serverSideSearch = serverSideSearchProperty
     ? resolveWidgetFieldValue(serverSideSearchProperty.value, currentState)
@@ -79,9 +81,11 @@ export function Table({
   const highlightSelectedRow = resolveWidgetFieldValue(highlightSelectedRowProperty, currentState) ?? false; // default is false for backward compatibility
 
   const clientSidePaginationProperty = component.definition.properties.clientSidePagination?.value;
-  const clientSidePagination =
+  let clientSidePagination =
     resolveWidgetFieldValue(clientSidePaginationProperty, currentState) ?? !serverSidePagination; // default is true for backward compatibility
 
+  if (typeof clientSidePagination !== 'boolean') clientSidePagination = true;
+
   const tableTypeProperty = component.definition.styles.tableType;
   let tableType = tableTypeProperty ? tableTypeProperty.value : 'table-bordered';
   tableType = tableType === '' ? 'table-bordered' : tableType;
diff --git a/frontend/src/Editor/SubContainer.jsx b/frontend/src/Editor/SubContainer.jsx
index d3e0805c98..b58e1bfa08 100644
--- a/frontend/src/Editor/SubContainer.jsx
+++ b/frontend/src/Editor/SubContainer.jsx
@@ -364,9 +364,9 @@ export const SubContainer = ({
           [optionName]: value,
         },
       };
-      onComponentOptionChanged(parentComponent, 'data', newData);
+      return onComponentOptionChanged(parentComponent, 'data', newData);
     } else {
-      onComponentOptionChanged(component, optionName, value, extraProps);
+      return onComponentOptionChanged(component, optionName, value, extraProps);
     }
   }