diff --git a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx b/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx
index b7b968bc33..901082c0dd 100644
--- a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx
+++ b/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { ApiConfig } from '../../v1/api/ApiConfig';
 import { SessionWrapper } from '../../session/SessionWrapper';
-import { useHistory, useParams, Link } from 'react-router-dom';
+import { useParams, Link } from 'react-router-dom';
 import { GravatarFc } from '../common/GravatarFc';
 
 interface W2lInferenceResultResponsePayload {
@@ -40,7 +40,6 @@ interface Props {
 }
 
 function W2lResultViewFc(props: Props) {
-  let history = useHistory();
   let { token } = useParams();
 
   const [w2lInferenceResult, setW2lInferenceResult] = useState<W2lInferenceResult|undefined>(undefined);
@@ -68,7 +67,7 @@ function W2lResultViewFc(props: Props) {
     .catch(e => {
       //this.props.onSpeakErrorCallback();
     });
-  }, []); // NB: Empty array dependency sets to run ONLY on mount
+  }, [token]); // NB: Empty array dependency sets to run ONLY on mount
 
   if (w2lInferenceResult === undefined) {
     return <div />;
diff --git a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx b/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx
index c18ba4eee9..9542da5e4b 100644
--- a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx
+++ b/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 import { ApiConfig } from '../../v1/api/ApiConfig';
-import { RouteProps, useHistory, useParams, Link } from 'react-router-dom';
+import { useParams, Link } from 'react-router-dom';
 import { SessionWrapper } from '../../session/SessionWrapper';
 import { v1 as uuidv1 } from 'uuid';
 
@@ -32,7 +32,6 @@ interface Props {
 }
 
 function W2lTemplateViewFc(props: Props) {
-  let history = useHistory();
   let { templateSlug } = useParams();
 
   const [w2lTemplate, setW2lTemplate] = useState<W2lTemplate|undefined>(undefined);
@@ -51,7 +50,6 @@ function W2lTemplateViewFc(props: Props) {
     })
     .then(res => res.json())
     .then(res => {
-      console.log('list', res);
       const templatesResponse : W2lTemplateViewResponsePayload = res;
       if (!templatesResponse.success) {
         return;
@@ -62,7 +60,7 @@ function W2lTemplateViewFc(props: Props) {
     .catch(e => {
       //this.props.onSpeakErrorCallback();
     });
-  }, []); // NB: Empty array dependency sets to run ONLY on mount
+  }, [templateSlug]); // NB: Empty array dependency sets to run ONLY on mount
 
   const handleAudioFileChange = (fileList: FileList|null) => {
     if (fileList === null