diff --git a/CHANGELOG.md b/CHANGELOG.md
index d951fde376..c55568cbc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  Fixes [#4028](https://github.com/microsoft/BotFramework-WebChat/issues/4028). Added new keyboard focus indicator for send box buttons, by [@compulim](https://github.com/compulim), in PR [#4035](https://github.com/microsoft/BotFramework-WebChat/pull/4035)
    -  New style options are introduced: `sendBoxButtonXXXOnActive`, `sendBoxButtonXXXOnFocus`, `sendBoxButtonXXXOnHover`, `sendBoxButtonKeyboardFocusIndicatorXXX`
 
+### Samples
+
+-  Fixes [#4031](https://github.com/microsoft/BotFramework-WebChat/issues/4031). Updated [`05.custom-components/b.send-typing-indicator`](../../samples/05.custom-components/b.send-typing-indicator) to reply with `message` activity, instead of `typing` activity, in PR [#4063](https://github.com/microsoft/BotFramework-WebChat/pull/4063), by [@compulim](https://github.com/compulim)
+
 ## [4.14.1] - 2021-09-07
 
 ### Fixed
diff --git a/samples/05.custom-components/b.send-typing-indicator/README.md b/samples/05.custom-components/b.send-typing-indicator/README.md
index 64e30aa072..b0a842e6e2 100644
--- a/samples/05.custom-components/b.send-typing-indicator/README.md
+++ b/samples/05.custom-components/b.send-typing-indicator/README.md
@@ -1,6 +1,6 @@
 # Sample - Enable Typing Indicator
 
-This sample shows Web Chat users how to enable the typing indicator activity from the user, which on Mock Bot is displayed as an animated gif. This is a helpful feature in multi-user chats.
+This sample shows how to send `typing` activity when the user type. When the Mock Bot receive the `typing` activity, it will display a message with a timestamp.
 
 # Test out the hosted sample
 
@@ -15,7 +15,9 @@ This sample shows Web Chat users how to enable the typing indicator activity fro
 
 # Things to try out
 
--  Note that when you as the user type, there is a typing indicator gif in the transcript. This is activated by the `sendTypingIndicator`.
+> Note: when the sample start, it will send a message `echo-typing-as-message` to the Mock Bot. After the bot received this command, it will reply to all `typing` activities sent from the user.
+
+-  When you type, the bot will send a message indicate the time it received the `typing` activity
 
 # Code
 
@@ -72,7 +74,7 @@ Here is the finished `index.html`:
 
         const store = window.WebChat.createStore({}, ({ dispatch }) => next => action => {
           if (action.type === 'DIRECT_LINE/CONNECT_FULFILLED') {
-            dispatch({ type: 'WEB_CHAT/SEND_MESSAGE', payload: { text: 'echo-typing' } });
+            dispatch({ type: 'WEB_CHAT/SEND_MESSAGE', payload: { text: 'echo-typing-as-message' } });
           }
 
           return next(action);
diff --git a/samples/05.custom-components/b.send-typing-indicator/index.html b/samples/05.custom-components/b.send-typing-indicator/index.html
index c68a3e5d9f..eaeeea86ef 100644
--- a/samples/05.custom-components/b.send-typing-indicator/index.html
+++ b/samples/05.custom-components/b.send-typing-indicator/index.html
@@ -40,7 +40,7 @@
         // When "echo-typing" is enabled on MockBot, it will echo back all typing indicator send from the user.
         const store = window.WebChat.createStore({}, ({ dispatch }) => next => action => {
           if (action.type === 'DIRECT_LINE/CONNECT_FULFILLED') {
-            dispatch({ type: 'WEB_CHAT/SEND_MESSAGE', payload: { text: 'echo-typing' } });
+            dispatch({ type: 'WEB_CHAT/SEND_MESSAGE', payload: { text: 'echo-typing-as-message' } });
           }
 
           return next(action);