diff --git a/libs/shared/lib/vis/visualizations/tablevis/components/Table.tsx b/libs/shared/lib/vis/visualizations/tablevis/components/Table.tsx
index 84ab338fb5f955dd96c6c9257ae961213b859b6d..4e8af9fdf6748c61e7c3e75c8329b4f213b7c4b2 100644
--- a/libs/shared/lib/vis/visualizations/tablevis/components/Table.tsx
+++ b/libs/shared/lib/vis/visualizations/tablevis/components/Table.tsx
@@ -84,7 +84,7 @@ export const Table = ({ data, itemsPerPage, showBarPlot, showAttributes, selecte
   }, [sortOrder, data, sortColumn]);
 
   useEffect(() => {
-    onPageChange(1); // Reset to the first page when sorting or itemsPerPage changes
+    onPageChange(1);
   }, [sortColumn, sortOrder, itemsPerPage]);
 
   const onPageChange = (page: number) => {
@@ -121,8 +121,7 @@ export const Table = ({ data, itemsPerPage, showBarPlot, showAttributes, selecte
   };
 
   useEffect(() => {
-    // Recalculate pagination state
-    const totalPages = Math.ceil(data.length / itemsPerPage);
+    setSortedData(data);
     setCurrentPage({
       page: 1,
       startIndex: 0,
diff --git a/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx b/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx
index b490a24785d55eb3cf76dcc171a3ab0450f6f755..2744b0be651a0e51079ab173a26a7bb455ce2604 100644
--- a/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx
+++ b/libs/shared/lib/vis/visualizations/tablevis/tablevis.tsx
@@ -81,6 +81,12 @@ const TableSettings = ({
     return [];
   }, [configuration.displayEntity, graph]);
 
+  useEffect(() => {
+    if (graph && graph.nodes && graph.nodes.labels.length > 0) {
+      updateSettings({ displayAttributes: selectedNodeAttributes });
+    }
+  }, [selectedNodeAttributes]);
+
   return (
     <SettingsContainer>
       <Input