diff --git a/Modules/CentcomCenter/MediaPlayer.qml b/Modules/CentcomCenter/MediaPlayer.qml
index 960ea9d0..dd088982 100644
--- a/Modules/CentcomCenter/MediaPlayer.qml
+++ b/Modules/CentcomCenter/MediaPlayer.qml
@@ -28,7 +28,9 @@ Rectangle {
 
     onActivePlayerChanged: {
         if (activePlayer && activePlayer.positionSupported) {
-            currentPosition = Qt.binding(() => activePlayer?.position)
+            currentPosition = Qt.binding(() => activePlayer?.position || 0)
+        } else {
+            currentPosition = 0
         }
     }
 
diff --git a/Modules/NotepadSlideout.qml b/Modules/NotepadSlideout.qml
index 8df30fe9..efa7df81 100644
--- a/Modules/NotepadSlideout.qml
+++ b/Modules/NotepadSlideout.qml
@@ -146,7 +146,6 @@ PanelWindow {
 
                     TextArea {
                         id: textArea
-                        text: SessionData.notepadContent
                         placeholderText: qsTr("Start typing your notes here...")
                         font.family: SettingsData.monoFontFamily
                         font.pixelSize: Theme.fontSizeMedium
@@ -164,6 +163,19 @@ PanelWindow {
                         rightPadding: Theme.spacingM
                         bottomPadding: Theme.spacingM
                         
+                        Component.onCompleted: {
+                            text = SessionData.notepadContent
+                        }
+                        
+                        Connections {
+                            target: SessionData
+                            function onNotepadContentChanged() {
+                                if (textArea.text !== SessionData.notepadContent) {
+                                    textArea.text = SessionData.notepadContent
+                                }
+                            }
+                        }
+                        
                         onTextChanged: {
                             if (text !== SessionData.notepadContent) {
                                 SessionData.notepadContent = text