diff --git a/ui/src/shared/components/time_series/TimeSeries.tsx b/ui/src/shared/components/time_series/TimeSeries.tsx
index f46b7bc0a..dbdd358d4 100644
--- a/ui/src/shared/components/time_series/TimeSeries.tsx
+++ b/ui/src/shared/components/time_series/TimeSeries.tsx
@@ -283,9 +283,10 @@ class TimeSeries extends Component<Props, State> {
     let responseUUID: string
     let loading: RemoteDataState = null
 
-    this.setState({loading: RemoteDataState.Loading})
     const latestUUID = uuid.v1()
 
+    this.setState({loading: RemoteDataState.Loading, latestUUID})
+
     try {
       if (this.isFluxQuery) {
         const results = await this.executeFluxQuery(latestUUID)
@@ -302,7 +303,7 @@ class TimeSeries extends Component<Props, State> {
         return
       }
 
-      if (responseUUID !== latestUUID) {
+      if (responseUUID !== this.state.latestUUID) {
         return
       }
 
@@ -317,7 +318,6 @@ class TimeSeries extends Component<Props, State> {
       rawFluxData,
       isFirstFetch: false,
       loading,
-      latestUUID,
     })
 
     if (grabDataForDownload) {