diff --git a/src/components/Results/TlsCipherSuites.tsx b/src/components/Results/TlsCipherSuites.tsx
index bfa3de7..59fe13a 100644
--- a/src/components/Results/TlsCipherSuites.tsx
+++ b/src/components/Results/TlsCipherSuites.tsx
@@ -1,5 +1,5 @@
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Card } from 'components/Form/Card';
 import Button from 'components/Form/Button';
 import { ExpandableRow } from 'components/Form/Row';
@@ -29,6 +29,10 @@ const TlsCard = (props: {data: any, title: string, actionButtons: any }): JSX.El
   const [cipherSuites, setCipherSuites] = useState(makeCipherSuites(props.data));
   const [loadState, setLoadState] = useState<undefined | 'loading' | 'success' | 'error'>(undefined);
 
+  useEffect(() => { // Update cipher suites when data changes
+    setCipherSuites(makeCipherSuites(props.data));
+  }, [props.data]);
+
   const updateData = (id: number) => {
     setCipherSuites([]);
     setLoadState('loading');
diff --git a/src/components/Results/TlsClientSupport.tsx b/src/components/Results/TlsClientSupport.tsx
index 84464c5..8f1c682 100644
--- a/src/components/Results/TlsClientSupport.tsx
+++ b/src/components/Results/TlsClientSupport.tsx
@@ -1,5 +1,5 @@
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Card } from 'components/Form/Card';
 import Button from 'components/Form/Button';
 import { ExpandableRow } from 'components/Form/Row';
@@ -38,6 +38,10 @@ const TlsCard = (props: {data: any, title: string, actionButtons: any }): JSX.El
   const [clientSupport, setClientSupport] = useState(makeClientSupport(props.data));
   const [loadState, setLoadState] = useState<undefined | 'loading' | 'success' | 'error'>(undefined);
 
+  useEffect(() => {
+    setClientSupport(makeClientSupport(props.data));
+  }, [props.data]);
+
   const updateData = (id: number) => {
     setClientSupport([]);
     setLoadState('loading');
diff --git a/src/components/Results/TlsIssueAnalysis.tsx b/src/components/Results/TlsIssueAnalysis.tsx
index c696a44..0926344 100644
--- a/src/components/Results/TlsIssueAnalysis.tsx
+++ b/src/components/Results/TlsIssueAnalysis.tsx
@@ -1,5 +1,5 @@
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import colors from 'styles/colors';
 import { Card } from 'components/Form/Card';
@@ -74,6 +74,11 @@ const TlsCard = (props: {data: any, title: string, actionButtons: any }): JSX.El
   const [tlsResults, setTlsResults] = useState(makeResults(props.data));
   const [loadState, setLoadState] = useState<undefined | 'loading' | 'success' | 'error'>(undefined);
 
+  useEffect(() => {
+    setTlsRowWata(makeExpandableData(props.data));
+    setTlsResults(makeResults(props.data));
+  }, [props.data]);
+
   const updateData = (id: number) => {
     setTlsRowWata([]);
     setLoadState('loading');