diff --git a/src/components/CallView/shared/LiveTranscriptionRenderer.vue b/src/components/CallView/shared/LiveTranscriptionRenderer.vue
index fee333d115d..8c0abfd1757 100644
--- a/src/components/CallView/shared/LiveTranscriptionRenderer.vue
+++ b/src/components/CallView/shared/LiveTranscriptionRenderer.vue
@@ -20,6 +20,7 @@
 
 <script lang="ts">
 import type { PropType } from 'vue'
+import type { Chunk } from './TranscriptBlock.vue'
 
 import TranscriptBlock from './TranscriptBlock.vue'
 import { useLiveTranscriptionStore } from '../../../stores/liveTranscription.ts'
@@ -49,11 +50,6 @@ interface CallParticipantModel {
 	off: (event: string, handler: (model: CallParticipantModel, ...args: any[]) => void) => void
 }
 
-interface Chunk {
-	message: string
-	languageId: string
-}
-
 interface TranscriptBlockData {
 	id: number
 	model: CallParticipantModel
@@ -175,7 +171,7 @@ export default {
 			}
 
 			for (let i = 0; i < this.$refs.transcriptBlocks.length; i++) {
-				this.$refs.transcriptBlocks[i].resetLines()
+				this.$refs.transcriptBlocks[i].reset()
 			}
 
 			this.$refs.transcript.scrollTo({
@@ -217,8 +213,10 @@ export default {
 		 * @param message the transcribed message.
 		 * @param languageId the ID of the language of the transcribed
 		 *        message.
+		 * @param final true if the transcript will not be updated afterwards,
+		 *        false otherwise.
 		 */
-		handleTranscript(model: CallParticipantModel, message: string, languageId: string) {
+		handleTranscript(model: CallParticipantModel, message: string, languageId: string, final: boolean) {
 			let lastTranscriptBlock = this.transcriptBlocks.at(-1)
 
 			const messageIsRightToLeft = this.liveTranscriptionLanguages[languageId]?.metadata.rtl || false
@@ -237,10 +235,18 @@ export default {
 				lastTranscriptBlock = transcriptBlock
 			}
 
-			lastTranscriptBlock.chunks.push({
+			const newTranscriptChunk = {
 				message,
 				languageId,
-			})
+				final,
+			}
+
+			const lastTranscriptChunk = lastTranscriptBlock.chunks.at(-1)
+			if (!lastTranscriptChunk || lastTranscriptChunk.final) {
+				lastTranscriptBlock.chunks.push(newTranscriptChunk)
+			} else {
+				lastTranscriptBlock.chunks.splice(-1, 1, newTranscriptChunk)
+			}
 
 			this.$nextTick(() => {
 				this.scrollToBottomLineByLine()
@@ -285,6 +291,13 @@ export default {
 			}
 
 			const lastScrolledToBlockLineBoundaries = this.$refs.transcriptBlocks![this.lastScrolledToBlockAndLine.block].getLineBoundaries()
+
+			// Fix line number if last chunk was replaced with a shorter text
+			// that uses less lines.
+			if (this.lastScrolledToBlockAndLine.line >= lastScrolledToBlockLineBoundaries.length) {
+				this.lastScrolledToBlockAndLine.line = lastScrolledToBlockLineBoundaries.length - 1
+			}
+
 			if (this.lastScrolledToBlockAndLine.line < lastScrolledToBlockLineBoundaries.length - 1) {
 				this.scrollToBlockAndLine(this.lastScrolledToBlockAndLine.block, this.lastScrolledToBlockAndLine.line + 1)
 
diff --git a/src/components/CallView/shared/TranscriptBlock.spec.js b/src/components/CallView/shared/TranscriptBlock.spec.js
new file mode 100644
index 00000000000..df5a498ee13
--- /dev/null
+++ b/src/components/CallView/shared/TranscriptBlock.spec.js
@@ -0,0 +1,194 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { shallowMount } from '@vue/test-utils'
+import { beforeEach, describe, expect, test } from 'vitest'
+import TranscriptBlock from './TranscriptBlock.vue'
+
+describe('TranscriptBlock.vue', () => {
+	describe('remove last chunk from lines', () => {
+		let wrapper
+		let lines
+
+		beforeEach(() => {
+			wrapper = shallowMount(TranscriptBlock, {
+				props: {
+					token: 'theToken',
+					model: {
+						attributes: {
+							peerId: 'thePeerId',
+							actorId: 'theActorId',
+							actorType: 'theActorType',
+							userId: 'theUserId',
+							name: 'The user name',
+						},
+					},
+					chunks: [],
+					rightToLeft: false,
+				},
+			})
+
+			lines = wrapper.vm.$data.lines
+		})
+
+		test('no lines', () => {
+			wrapper.vm.removeLastChunkFromLines()
+
+			expect(lines.length).toBe(0)
+		})
+
+		test('single line with single chunk', () => {
+			lines.push({
+				firstChunkIndex: 42,
+				lastChunkIndex: 42,
+			})
+
+			wrapper.vm.removeLastChunkFromLines()
+
+			expect(lines.length).toBe(0)
+		})
+
+		test('single line with several chunks', () => {
+			lines.push({
+				firstChunkIndex: 42,
+				lastChunkIndex: 108,
+			})
+
+			wrapper.vm.removeLastChunkFromLines()
+
+			expect(lines).toEqual([
+				{
+					firstChunkIndex: 42,
+					lastChunkIndex: 107,
+				},
+			])
+		})
+
+		test('several lines with single chunk', () => {
+			lines.push({
+				firstChunkIndex: 42,
+				lastChunkIndex: 42,
+			})
+			lines.push({
+				firstChunkIndex: 42,
+				lastChunkIndex: 42,
+			})
+			lines.push({
+				firstChunkIndex: 42,
+				lastChunkIndex: 42,
+			})
+
+			wrapper.vm.removeLastChunkFromLines()
+
+			expect(lines.length).toBe(0)
+		})
+
+		describe('several lines with several chunks', () => {
+			test('last chunk filling last line', () => {
+				lines.push({
+					firstChunkIndex: 23,
+					lastChunkIndex: 42,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+
+				wrapper.vm.removeLastChunkFromLines()
+
+				expect(lines).toEqual([
+					{
+						firstChunkIndex: 23,
+						lastChunkIndex: 42,
+					},
+				])
+			})
+
+			test('last chunk filling several lines', () => {
+				lines.push({
+					firstChunkIndex: 23,
+					lastChunkIndex: 42,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+
+				wrapper.vm.removeLastChunkFromLines()
+
+				expect(lines).toEqual([
+					{
+						firstChunkIndex: 23,
+						lastChunkIndex: 42,
+					},
+				])
+			})
+
+			test('last chunk partially in last line', () => {
+				lines.push({
+					firstChunkIndex: 23,
+					lastChunkIndex: 42,
+				})
+				lines.push({
+					firstChunkIndex: 42,
+					lastChunkIndex: 108,
+				})
+
+				wrapper.vm.removeLastChunkFromLines()
+
+				expect(lines).toEqual([
+					{
+						firstChunkIndex: 23,
+						lastChunkIndex: 42,
+					},
+					{
+						firstChunkIndex: 42,
+						lastChunkIndex: 107,
+					},
+				])
+			})
+
+			test('last chunk partially in several lines', () => {
+				lines.push({
+					firstChunkIndex: 23,
+					lastChunkIndex: 42,
+				})
+				lines.push({
+					firstChunkIndex: 42,
+					lastChunkIndex: 108,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+				lines.push({
+					firstChunkIndex: 108,
+					lastChunkIndex: 108,
+				})
+
+				wrapper.vm.removeLastChunkFromLines()
+
+				expect(lines).toEqual([
+					{
+						firstChunkIndex: 23,
+						lastChunkIndex: 42,
+					},
+					{
+						firstChunkIndex: 42,
+						lastChunkIndex: 107,
+					},
+				])
+			})
+		})
+	})
+})
diff --git a/src/components/CallView/shared/TranscriptBlock.vue b/src/components/CallView/shared/TranscriptBlock.vue
index 7e8df1ae275..b135e12bd54 100644
--- a/src/components/CallView/shared/TranscriptBlock.vue
+++ b/src/components/CallView/shared/TranscriptBlock.vue
@@ -20,7 +20,9 @@
 			<p class="transcript-block__author">
 				{{ actorInfo }}
 			</p>
-			<p class="transcript-block__chunks">
+			<p
+				ref="chunksWrapper"
+				class="transcript-block__chunks">
 				<span
 					v-for="(item, index) in chunksWithSeparator"
 					ref="chunks"
@@ -43,7 +45,8 @@ import { getDisplayNameWithFallback } from '../../../utils/getDisplayName.ts'
 
 declare module 'vue' {
 	interface TypeRefs {
-		chunks: undefined | Array<HTMLDivElement>
+		chunksWrapper: HTMLParagraphElement
+		chunks: undefined | Array<HTMLSpanElement>
 	}
 
 	interface ComponentCustomProperties {
@@ -64,6 +67,16 @@ interface CallParticipantModel {
 interface Chunk {
 	message: string
 	languageId: string
+	final: boolean
+}
+
+interface ChunkElementData {
+	message: string
+	languageId: string
+}
+
+export type {
+	Chunk,
 }
 
 export default {
@@ -119,7 +132,11 @@ export default {
 	data() {
 		return {
 			AVATAR,
-			lines: [] as Array<{ lastChunkIndex: number }>,
+			resizeObserver: null as null | ResizeObserver,
+			lines: [] as Array<{
+				firstChunkIndex: number
+				lastChunkIndex: number
+			}>,
 		}
 	},
 
@@ -167,7 +184,7 @@ export default {
 		},
 
 		chunksWithSeparator() {
-			const chunksWithSeparator = [] as Array<Chunk>
+			const chunksWithSeparator = [] as Array<ChunkElementData>
 
 			if (!this.chunks.length) {
 				return chunksWithSeparator
@@ -196,9 +213,49 @@ export default {
 		},
 	},
 
+	mounted() {
+		this.resizeObserver = new ResizeObserver(this.handleChunksWrapperResize)
+		this.resizeObserver.observe(this.$refs.chunksWrapper)
+	},
+
+	beforeUnmount() {
+		this.resizeObserver!.disconnect()
+	},
+
 	methods: {
-		resetLines() {
+		reset() {
 			this.lines = []
+
+			this.$refs.chunksWrapper!.style.removeProperty('min-height')
+		},
+
+		handleChunksWrapperResize(entries: ResizeObserverEntry[], observer: ResizeObserver) {
+			if (!this.$refs.chunksWrapper) {
+				return
+			}
+
+			const height = parseFloat(window.getComputedStyle(this.$refs.chunksWrapper).getPropertyValue('height'))
+			const minHeight = parseFloat(window.getComputedStyle(this.$refs.chunksWrapper).getPropertyValue('min-height'))
+
+			if (height > minHeight || Number.isNaN(minHeight)) {
+				this.$refs.chunksWrapper.style.setProperty('min-height', `${height}px`)
+			}
+		},
+
+		removeLastChunkFromLines() {
+			if (!this.lines.length) {
+				return
+			}
+
+			const lastKnownChunkIndex = this.lines.at(-1)!.lastChunkIndex
+
+			while (this.lines.length && this.lines.at(-1)!.firstChunkIndex === this.lines.at(-1)!.lastChunkIndex) {
+				this.lines.splice(-1, 1)
+			}
+
+			if (this.lines.length && this.lines.at(-1)!.lastChunkIndex === lastKnownChunkIndex) {
+				this.lines.at(-1)!.lastChunkIndex--
+			}
 		},
 
 		updateLines() {
@@ -206,6 +263,10 @@ export default {
 				return
 			}
 
+			// Remove information of last chunk to regenerate it, as it could
+			// have been updated and thus its lines could have changed.
+			this.removeLastChunkFromLines()
+
 			if (!this.lines.length) {
 				const firstChunkClientRectsLength = this.$refs.chunks[0].getClientRects().length
 
@@ -213,6 +274,7 @@ export default {
 				// rectangles each rectangle will be in its own line.
 				for (let i = 0; i < firstChunkClientRectsLength; i++) {
 					this.lines.push({
+						firstChunkIndex: 0,
 						lastChunkIndex: 0,
 					})
 				}
@@ -229,13 +291,6 @@ export default {
 			for (let i = lastKnownChunkIndex + 1; i < this.$refs.chunks.length; i++) {
 				const nextChunkElement = this.$refs.chunks[i]
 
-				// Separators are inline rather than inline-block, so they have
-				// different top and bottom boundaries and they should not be
-				// taken into account.
-				if (nextChunkElement.classList.contains('separator')) {
-					continue
-				}
-
 				const nextChunkElementClientRects = nextChunkElement.getClientRects()
 				const nextChunkElementTop = nextChunkElementClientRects[0].top
 
@@ -246,6 +301,7 @@ export default {
 					this.lines.at(-1)!.lastChunkIndex = i
 				} else {
 					this.lines.push({
+						firstChunkIndex: i,
 						lastChunkIndex: i,
 					})
 				}
@@ -254,6 +310,7 @@ export default {
 				// line.
 				for (let j = 1; j < nextChunkElementClientRects.length; j++) {
 					this.lines.push({
+						firstChunkIndex: i,
 						lastChunkIndex: i,
 					})
 				}
diff --git a/src/utils/webrtc/models/CallParticipantModel.js b/src/utils/webrtc/models/CallParticipantModel.js
index 72cde0a32a3..32866ea7168 100644
--- a/src/utils/webrtc/models/CallParticipantModel.js
+++ b/src/utils/webrtc/models/CallParticipantModel.js
@@ -420,7 +420,7 @@ CallParticipantModel.prototype = {
 			return
 		}
 
-		this._trigger('transcript', [data.message, data.languageId])
+		this._trigger('transcript', [data.message, data.languageId, data.final])
 	},
 
 }
diff --git a/src/utils/webrtc/simplewebrtc/simplewebrtc.js b/src/utils/webrtc/simplewebrtc/simplewebrtc.js
index 3d0057e9fdb..5a787e85ca4 100644
--- a/src/utils/webrtc/simplewebrtc/simplewebrtc.js
+++ b/src/utils/webrtc/simplewebrtc/simplewebrtc.js
@@ -131,7 +131,12 @@ export default function SimpleWebRTC(opts) {
 		} else if (message.type === 'transcript') {
 			// "transcript" will be received from the transcription service,
 			// which will not have a Peer object.
-			self.emit('transcript', { id: message.speakerSessionId, message: message.message, languageId: message.langId })
+			self.emit('transcript', {
+				id: message.speakerSessionId,
+				message: message.message,
+				languageId: message.langId,
+				final: message.final !== undefined ? message.final : true,
+			})
 		} else if (peers.length) {
 			peers.forEach(function(peer) {
 				if (message.sid && !self.connection.hasFeature('mcu')) {