diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 731dfed949..42d45d9f89 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -361,11 +361,13 @@ class TimelineEventController @Inject constructor(
                 .setVisibilityStateChangedListener(Timeline.Direction.FORWARDS)
                 .addWhenLoading(Timeline.Direction.FORWARDS)
 
+        /* SC: don't use TypingItem
         if (!showingForwardLoader) {
             val typingUsers = partialState.roomSummary?.typingUsers.orEmpty()
             val typingItem = TypingItem_().id("typing_view").avatarRenderer(avatarRenderer).users(typingUsers)
             add(typingItem)
         }
+         */
 
         val timelineModels = getModels()
         add(timelineModels)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt
index 2ca0ebea48..ac573af490 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TypingItem.kt
@@ -45,6 +45,9 @@ abstract class TypingItem : EpoxyModelWithHolder<TypingItem.TypingHolder>() {
     override fun bind(holder: TypingHolder) {
         super.bind(holder)
 
+        // SC: don't use TypingItem (but instead toolbar-based typing indicator)
+        holder.typingView.isVisible = false
+        /*
         val typingUsers = users.take(MAX_TYPING_MESSAGE_USERS_COUNT)
         holder.typingView.apply {
             animate().cancel()
@@ -68,6 +71,7 @@ abstract class TypingItem : EpoxyModelWithHolder<TypingItem.TypingHolder>() {
                         .start()
             }
         }
+         */
     }
 
     class TypingHolder : VectorEpoxyHolder() {