diff --git a/extensions/ql-vscode/src/view/results/ResultTables.tsx b/extensions/ql-vscode/src/view/results/ResultTables.tsx
index c153f498e..f5697f7e0 100644
--- a/extensions/ql-vscode/src/view/results/ResultTables.tsx
+++ b/extensions/ql-vscode/src/view/results/ResultTables.tsx
@@ -164,7 +164,7 @@ export function ResultTables(props: ResultTablesProps) {
     return () => {
       window.removeEventListener("message", vscodeMessageHandler);
     };
-  }, []);
+  }, [vscodeMessageHandler]);
 
   useEffect(() => {
     const resultSetExists =
@@ -180,7 +180,7 @@ export function ResultTables(props: ResultTablesProps) {
           getDefaultResultSet(getResultSets(rawResultSets, interpretation)),
       );
     }
-  });
+  }, [parsedResultSets, interpretation, rawResultSets, selectedTable]);
 
   const onTableSelectionChange = (
     event: React.ChangeEvent<HTMLSelectElement>,