diff --git a/src/components/webcams/WebrtcMediaMTX.vue b/src/components/webcams/WebrtcMediaMTX.vue
index 8d2ce39fc..257a93808 100644
--- a/src/components/webcams/WebrtcMediaMTX.vue
+++ b/src/components/webcams/WebrtcMediaMTX.vue
@@ -23,27 +23,36 @@ import BaseMixin from '@/components/mixins/base'
 import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
 import WebcamMixin from '@/components/mixins/webcam'
 
+interface OfferData {
+    iceUfrag: string
+    icePwd: string
+    medias: string[]
+}
+
 @Component
-export default class WebrtcRTSPSimpleServer extends Mixins(BaseMixin, WebcamMixin) {
+export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
     @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
     @Prop({ default: null }) readonly printerUrl!: string | null
     @Ref() declare video: HTMLVideoElement
 
-    // webrtc player vars
-    private terminated: boolean = false
-    private ws: WebSocket | null = null
     private pc: RTCPeerConnection | null = null
-    private restartTimeoutTimer: any = null
+    private restartTimeout: any = null
     private status: string = 'connecting'
+    private eTag: string | null = null
+    private queuedCandidates: RTCIceCandidate[] = []
+    private offerData: OfferData = {
+        iceUfrag: '',
+        icePwd: '',
+        medias: [],
+    }
+    private RESTART_PAUSE = 2000
 
     // stop the video and close the streams if the component is going to be destroyed so we don't leave hanging streams
     beforeDestroy() {
         this.terminate()
 
         // clear any potentially open restart timeout
-        if (this.restartTimeoutTimer) {
-            clearTimeout(this.restartTimeoutTimer)
-        }
+        if (this.restartTimeout) clearTimeout(this.restartTimeout)
     }
 
     get webcamStyle() {
@@ -58,9 +67,9 @@ export default class WebrtcRTSPSimpleServer extends Mixins(BaseMixin, WebcamMixi
 
     get url() {
         let baseUrl = this.camSettings.stream_url
-        if (baseUrl.startsWith('http')) {
-            baseUrl = baseUrl.replace('http', 'ws') + 'ws'
-        }
+        if (!baseUrl.endsWith('/')) baseUrl += '/'
+
+        baseUrl = new URL('whep', baseUrl).toString()
 
         return this.convertUrl(baseUrl, this.printerUrl)
     }
@@ -87,140 +96,246 @@ export default class WebrtcRTSPSimpleServer extends Mixins(BaseMixin, WebcamMixi
         this.start()
     }
 
+    log(msg: string, obj?: any) {
+        if (obj) {
+            window.console.log(`[WebRTC mediamtx] ${msg}`, obj)
+            return
+        }
+
+        window.console.log(`[WebRTC mediamtx] ${msg}`)
+    }
+
     // webrtc player methods
-    // adapated from sample player in https://github.com/mrlt8/docker-wyze-bridge
-    start() {
-        // unterminate we're starting again.
-        this.terminated = false
+    // adapted from https://github.com/bluenviron/mediamtx/blob/main/internal/core/webrtc_read_index.html
 
-        // clear any potentially open restart timeout
-        if (this.restartTimeoutTimer) {
-            clearTimeout(this.restartTimeoutTimer)
-            this.restartTimeoutTimer = null
-        }
+    unquoteCredential = (v: any) => JSON.parse(`"${v}"`)
 
-        window.console.log('[webcam-rtspsimpleserver] web socket connecting')
+    // eslint-disable-next-line no-undef
+    linkToIceServers(links: string | null): RTCIceServer[] {
+        if (links === null) return []
 
-        // test if the url is valid
-        try {
-            const url = new URL(this.url)
+        return links.split(', ').map((link) => {
+            const m: RegExpMatchArray | null = link.match(
+                /^<(.+?)>; rel="ice-server"(; username="(.*?)"; credential="(.*?)"; credential-type="password")?/i
+            )
 
-            // break if url protocol is not ws
-            if (!url.protocol.startsWith('ws')) {
-                console.log('[webcam-rtspsimpleserver] invalid URL (no ws protocol)')
-                return
+            // break if match is null
+            if (m === null) return { urls: '' }
+
+            // eslint-disable-next-line no-undef
+            const ret: RTCIceServer = {
+                urls: [m[1]],
+            }
+
+            if (m.length > 3) {
+                ret.username = this.unquoteCredential(m[3])
+                ret.credential = this.unquoteCredential(m[4])
+                ret.credentialType = 'password'
             }
-        } catch (err) {
-            console.log('[webcam-rtspsimpleserver] invalid URL')
-            return
-        }
 
-        // open websocket connection
-        this.ws = new WebSocket(this.url)
+            return ret
+        })
+    }
 
-        this.ws.onerror = (event) => {
-            window.console.log('[webcam-rtspsimpleserver] websocket error', event)
-            this.ws?.close()
-            this.ws = null
+    parseOffer(offer: string) {
+        const ret: OfferData = {
+            iceUfrag: '',
+            icePwd: '',
+            medias: [],
         }
 
-        this.ws.onclose = (event) => {
-            console.log('[webcam-rtspsimpleserver] websocket closed', event)
-            this.ws = null
-            this.scheduleRestart()
+        for (const line of offer.split('\r\n')) {
+            if (line.startsWith('m=')) {
+                ret.medias.push(line.slice('m='.length))
+            } else if (ret.iceUfrag === '' && line.startsWith('a=ice-ufrag:')) {
+                ret.iceUfrag = line.slice('a=ice-ufrag:'.length)
+            } else if (ret.icePwd === '' && line.startsWith('a=ice-pwd:')) {
+                ret.icePwd = line.slice('a=ice-pwd:'.length)
+            }
         }
 
-        this.ws.onmessage = (msg: MessageEvent) => this.webRtcOnIceServers(msg)
+        return ret
     }
 
-    terminate() {
-        this.terminated = true
+    generateSdpFragment(offerData: OfferData, candidates: RTCIceCandidate[]) {
+        // I don't found a specification for this, but it seems to be the only way to make it work
+        const candidatesByMedia: any = {}
+        for (const candidate of candidates) {
+            const mid = candidate.sdpMLineIndex
+            if (mid === null) continue
 
-        try {
-            this.video.pause()
-        } catch (err) {
-            // ignore -- make sure we close down the sockets anyway
+            // create the array if it doesn't exist
+            if (!(mid in candidatesByMedia)) candidatesByMedia[mid] = []
+            candidatesByMedia[mid].push(candidate)
         }
 
-        this.ws?.close()
-        this.pc?.close()
-    }
+        let frag = 'a=ice-ufrag:' + offerData.iceUfrag + '\r\n' + 'a=ice-pwd:' + offerData.icePwd + '\r\n'
+        let mid = 0
 
-    webRtcOnIceServers(msg: MessageEvent) {
-        if (this.ws === null) return
+        for (const media of offerData.medias) {
+            if (candidatesByMedia[mid] !== undefined) {
+                frag += 'm=' + media + '\r\n' + 'a=mid:' + mid + '\r\n'
 
-        const iceServers = JSON.parse(msg.data)
-        this.pc = new RTCPeerConnection({
-            iceServers,
-        })
-
-        this.ws.onmessage = (msg: MessageEvent) => this.webRtcOnRemoteDescription(msg)
-        this.pc.onicecandidate = (evt: RTCPeerConnectionIceEvent) => this.webRtcOnIceCandidate(evt)
+                for (const candidate of candidatesByMedia[mid]) {
+                    frag += 'a=' + candidate.candidate + '\r\n'
+                }
+            }
 
-        this.pc.oniceconnectionstatechange = () => {
-            if (this.pc === null) return
+            mid++
+        }
 
-            window.console.log('[webcam-rtspsimpleserver] peer connection state:', this.pc.iceConnectionState)
+        return frag
+    }
 
-            this.status = (this.pc?.iceConnectionState ?? '').toString()
+    start() {
+        this.log('requesting ICE servers from ' + this.url)
 
-            if (['failed', 'disconnected'].includes(this.status)) {
+        fetch(this.url, {
+            method: 'OPTIONS',
+        })
+            .then((res) => this.onIceServers(res))
+            .catch((err) => {
+                this.log('error: ' + err)
                 this.scheduleRestart()
-            }
-        }
+            })
+    }
 
-        this.pc.ontrack = (evt: RTCTrackEvent) => {
-            window.console.log('[webcam-rtspsimpleserver] new track ' + evt.track.kind)
-            this.video.srcObject = evt.streams[0]
-        }
+    onIceServers(res: Response) {
+        const iceServers = this.linkToIceServers(res.headers.get('Link'))
+        this.log('ice servers:', iceServers)
+
+        this.pc = new RTCPeerConnection({
+            iceServers,
+        })
 
         const direction = 'sendrecv'
         this.pc.addTransceiver('video', { direction })
         this.pc.addTransceiver('audio', { direction })
 
-        this.pc.createOffer().then((desc: any) => {
-            if (this.pc === null || this.ws === null) return
+        this.pc.onicecandidate = (evt: RTCPeerConnectionIceEvent) => this.onLocalCandidate(evt)
+        this.pc.oniceconnectionstatechange = () => this.onConnectionState()
 
-            this.pc.setLocalDescription(desc)
+        this.pc.ontrack = (evt) => {
+            this.log('new track:', evt.track.kind)
+            this.video.srcObject = evt.streams[0]
+        }
+
+        this.pc.createOffer().then((offer) => this.onLocalOffer(offer))
+    }
 
-            window.console.log('[webcam-rtspsimpleserver] sending offer')
-            this.ws.send(JSON.stringify(desc))
+    // eslint-disable-next-line no-undef
+    onLocalOffer(offer: RTCSessionDescriptionInit) {
+        this.offerData = this.parseOffer(offer.sdp ?? '')
+        this.pc?.setLocalDescription(offer)
+
+        fetch(this.url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/sdp',
+            },
+            body: offer.sdp,
         })
+            .then((res) => {
+                if (res.status !== 201) throw new Error('bad status code')
+                this.eTag = res.headers.get('ETag')
+
+                // fallback for MediaMTX v1.0.x with broken ETag header
+                if (res.headers.has('E-Tag')) this.eTag = res.headers.get('E-Tag')
+
+                return res.text()
+            })
+            .then((sdp) => {
+                this.onRemoteAnswer(
+                    new RTCSessionDescription({
+                        type: 'answer',
+                        sdp,
+                    })
+                )
+            })
+            .catch((err) => {
+                this.log(err)
+                this.scheduleRestart()
+            })
+    }
+
+    onRemoteAnswer(answer: RTCSessionDescription) {
+        if (this.restartTimeout !== null) return
+
+        // this.pc.setRemoteDescription(new RTCSessionDescription(answer));
+        this.pc?.setRemoteDescription(answer)
+
+        if (this.queuedCandidates.length !== 0) {
+            this.sendLocalCandidates(this.queuedCandidates)
+            this.queuedCandidates = []
+        }
     }
 
-    webRtcOnRemoteDescription(msg: any) {
-        if (this.pc === null || this.ws === null) return
+    onConnectionState() {
+        if (this.restartTimeout !== null) return
+
+        this.status = this.pc?.iceConnectionState ?? ''
+        this.log('peer connection state:', this.status)
 
-        this.pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.data)))
-        this.ws.onmessage = (msg: any) => this.webRtcOnRemoteCandidate(msg)
+        switch (this.status) {
+            case 'disconnected':
+                this.scheduleRestart()
+        }
     }
 
-    webRtcOnIceCandidate(evt: RTCPeerConnectionIceEvent) {
-        if (this.ws === null) return
+    onLocalCandidate(evt: RTCPeerConnectionIceEvent) {
+        if (this.restartTimeout !== null) return
 
-        if (evt.candidate?.candidate !== '') {
-            this.ws.send(JSON.stringify(evt.candidate))
+        if (evt.candidate !== null) {
+            if (this.eTag === '') {
+                this.queuedCandidates.push(evt.candidate)
+                return
+            }
+
+            this.sendLocalCandidates([evt.candidate])
         }
     }
 
-    webRtcOnRemoteCandidate(msg: any) {
-        if (this.pc === null) return
+    sendLocalCandidates(candidates: RTCIceCandidate[]) {
+        fetch(this.url, {
+            method: 'PATCH',
+            headers: {
+                'Content-Type': 'application/trickle-ice-sdpfrag',
+                'If-Match': this.eTag,
+                // eslint-disable-next-line no-undef
+            } as HeadersInit,
+            body: this.generateSdpFragment(this.offerData, candidates),
+        })
+            .then((res) => {
+                if (res.status !== 204) throw new Error('bad status code')
+            })
+            .catch((err) => {
+                this.log(err)
+                this.scheduleRestart()
+            })
+    }
+
+    terminate() {
+        this.log('terminating')
 
-        this.pc.addIceCandidate(JSON.parse(msg.data))
+        if (this.pc !== null) {
+            this.pc.close()
+            this.pc = null
+        }
     }
 
     scheduleRestart() {
-        this.ws?.close()
-        this.ws = null
-
-        this.pc?.close()
-        this.pc = null
+        if (this.restartTimeout !== null) return
 
-        if (this.terminated) return
+        this.terminate()
 
-        this.restartTimeoutTimer = setTimeout(() => {
+        this.restartTimeout = window.setTimeout(() => {
+            this.log('scheduling restart')
+            this.restartTimeout = null
             this.start()
-        }, 2000)
+        }, this.RESTART_PAUSE)
+
+        this.eTag = ''
+        this.queuedCandidates = []
     }
 }
 </script>
diff --git a/src/locales/de.json b/src/locales/de.json
index ab2e2df80..ea4ee74e0 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1144,7 +1144,7 @@
             "Webcams": "Webcams",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
             "WebrtcJanus": "WebRTC (janus-gateway)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
diff --git a/src/locales/en.json b/src/locales/en.json
index f66f3878d..083ab0a76 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1146,7 +1146,7 @@
             "Webcams": "Webcams",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
             "WebrtcJanus": "WebRTC (janus-gateway)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
diff --git a/src/locales/tr.json b/src/locales/tr.json
index b5f51e8ec..812ec8b8d 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -1132,7 +1132,7 @@
             "Webcams": "Web Kameraları",
             "WebrtcCameraStreamer": "WebRTC (kamera-streamer)",
             "WebrtcJanus": "WebRTC (janus-gateway)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
diff --git a/src/locales/zh.json b/src/locales/zh.json
index c1564fe30..4d93dbee3 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1137,7 +1137,7 @@
             "Webcams": "摄像头",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
             "WebrtcJanus": "WebRTC (janus-gateway)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {