diff --git a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/AiMessage.qml b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/AiMessage.qml
index 74d5c5f6a..487665851 100644
--- a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/AiMessage.qml
+++ b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/AiMessage.qml
@@ -285,48 +285,36 @@ Rectangle {
                     }
                 }
             }
-
             Repeater {
                 model: ScriptModel {
-                    values: Array.from({ length: root.messageBlocks.length }, (msg, i) => {
-                        return ({
-                            type: root.messageBlocks[i].type
-                        })
-                    });
+                    values: root.messageBlocks
                 }
-
                 delegate: DelegateChooser {
                     id: messageDelegate
                     role: "type"
 
                     DelegateChoice { roleValue: "code"; MessageCodeBlock {
-                        required property int index
-                        property var thisBlock: root.messageBlocks[index]
                         editing: root.editing
                         renderMarkdown: root.renderMarkdown
                         enableMouseSelection: root.enableMouseSelection
-                        segmentContent: thisBlock.content
-                        segmentLang: thisBlock.lang
+                        segmentContent: modelData.content
+                        segmentLang: modelData.lang
                         messageData: root.messageData
                     } }
                     DelegateChoice { roleValue: "think"; MessageThinkBlock {
-                        required property int index
-                        property var thisBlock: root.messageBlocks[index]
                         editing: root.editing
                         renderMarkdown: root.renderMarkdown
                         enableMouseSelection: root.enableMouseSelection
-                        segmentContent: thisBlock.content
+                        segmentContent: modelData.content
                         messageData: root.messageData
                         done: root.messageData?.done ?? false
-                        completed: thisBlock.completed ?? false
+                        completed: modelData.completed ?? false
                     } }
                     DelegateChoice { roleValue: "text"; MessageTextBlock {
-                        required property int index
-                        property var thisBlock: root.messageBlocks[index]
                         editing: root.editing
                         renderMarkdown: root.renderMarkdown
                         enableMouseSelection: root.enableMouseSelection
-                        segmentContent: thisBlock.content
+                        segmentContent: modelData.content
                         messageData: root.messageData
                         done: root.messageData?.done ?? false
                         forceDisableChunkSplitting: root.messageData?.content.includes("```") ?? true
diff --git a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/MessageThinkBlock.qml b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/MessageThinkBlock.qml
index 1463c6e60..ee00ffdff 100644
--- a/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/MessageThinkBlock.qml
+++ b/dots/.config/quickshell/ii/modules/ii/sidebarLeft/aiChat/MessageThinkBlock.qml
@@ -156,7 +156,6 @@ Item {
                 property bool editing: root.editing
                 property bool renderMarkdown: root.renderMarkdown
                 property bool enableMouseSelection: root.enableMouseSelection
-                property string segmentContent: root.segmentContent
                 property var messageData: root.messageData
                 property bool done: root.done
 
@@ -165,8 +164,9 @@ Item {
                     anchors.left: parent.left
                     anchors.right: parent.right
                     anchors.bottom: parent.bottom
+                    segmentContent: root.segmentContent
                 }
             }
         }
     }
-}
\ No newline at end of file
+}