diff --git a/Composer/packages/lib/code-editor/src/lg/ModalityPivot.tsx b/Composer/packages/lib/code-editor/src/lg/ModalityPivot.tsx
index 29d93ec762..5b9a8b95b4 100644
--- a/Composer/packages/lib/code-editor/src/lg/ModalityPivot.tsx
+++ b/Composer/packages/lib/code-editor/src/lg/ModalityPivot.tsx
@@ -168,6 +168,11 @@ const getInitialModalities = (structuredResponse?: PartialStructuredResponse): M
   const modalities = Object.keys(structuredResponse || {}).filter((m) =>
     modalityTypes.includes(m as ModalityType)
   ) as ModalityType[];
+
+  if (structuredResponse?.InputHint && !structuredResponse.Speak) {
+    modalities.push('Speak');
+  }
+
   return modalities.length ? modalities : ['Text'];
 };
 
@@ -284,6 +289,11 @@ export const ModalityPivot = React.memo((props: Props) => {
           const mergedResponse = mergeWith({}, structuredResponse) as PartialStructuredResponse;
           delete mergedResponse[modality];
 
+          // Remove Input Hint when the user deletes the Speech modality
+          if (modality === 'Speak') {
+            delete mergedResponse.InputHint;
+          }
+
           setStructuredResponse(mergedResponse);
           const mappedResponse = structuredResponseToString(mergedResponse);
           onTemplateChange(lgOption.templateId, mappedResponse);