diff --git a/frontend/src/views/chat/chat-block/ChartBlock.vue b/frontend/src/views/chat/chat-block/ChartBlock.vue
index fc07a25b..86ab2b36 100644
--- a/frontend/src/views/chat/chat-block/ChartBlock.vue
+++ b/frontend/src/views/chat/chat-block/ChartBlock.vue
@@ -117,7 +117,9 @@ const chartObject = computed<{
   return {}
 })
 
-const currentChartType = ref<ChartTypes | undefined>(undefined)
+const currentChartType = ref<ChartTypes | undefined>(
+  props.chatType ?? chartObject.value.type ?? 'table'
+)
 
 const chartType = computed<ChartTypes>({
   get() {