diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
index b20fa72012..8d8f42b2d1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
@@ -56,18 +56,9 @@ class WidgetItemFactory @Inject constructor(
         val previousWidgetContent: WidgetContent? = event.root.resolvedPrevContent().toModel()
 
         return when (WidgetType.fromString(widgetContent.type ?: previousWidgetContent?.type ?: "")) {
-            WidgetType.Jitsi       -> createJitsiItem(event, callback, widgetContent, previousWidgetContent)
-            WidgetType.TradingView,
-            WidgetType.Spotify,
-            WidgetType.Video,
-            WidgetType.GoogleDoc,
-            WidgetType.GoogleCalendar,
-            WidgetType.Etherpad,
-            WidgetType.StickerPicker,
-            WidgetType.Grafana,
-            WidgetType.Custom,
-            WidgetType.IntegrationManager,
-            is WidgetType.Fallback -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
+            WidgetType.Jitsi -> createJitsiItem(event, callback, widgetContent, previousWidgetContent)
+            // There is lot of other widget types we could improve here
+            else             -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
         }
     }