diff --git a/apps/client/package.json b/apps/client/package.json
index cd1317e2b..ba0fbb97b 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -53,7 +53,7 @@
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
-    "marked": "16.4.2",
+    "marked": "17.0.0",
     "mermaid": "11.12.1",
     "mind-elixir": "5.3.6",
     "normalize.css": "8.0.1",
diff --git a/apps/server/package.json b/apps/server/package.json
index 53a2d2d32..1e908000a 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -103,7 +103,7 @@
     "is-animated": "2.0.2",
     "is-svg": "6.1.0",
     "jimp": "1.6.0",
-    "marked": "16.4.2",
+    "marked": "17.0.0",
     "mime-types": "3.0.1",
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
diff --git a/apps/server/src/services/import/markdown.ts b/apps/server/src/services/import/markdown.ts
index 177211427..94bf928a5 100644
--- a/apps/server/src/services/import/markdown.ts
+++ b/apps/server/src/services/import/markdown.ts
@@ -66,7 +66,7 @@ class CustomMarkdownRenderer extends Renderer {
         // Handle todo-list in the CKEditor format.
         if (item.task) {
             let itemBody = '';
-            const checkbox = this.checkbox({ checked: !!item.checked });
+            const checkbox = this.checkbox({ checked: !!item.checked, raw: "- [ ]", type: "checkbox" });
             if (item.loose) {
                 if (item.tokens[0]?.type === 'paragraph') {
                     item.tokens[0].text = checkbox + item.tokens[0].text;
@@ -86,7 +86,7 @@ class CustomMarkdownRenderer extends Renderer {
                 itemBody += checkbox;
             }
 
-            itemBody += `<span class="todo-list__label__description">${this.parser.parse(item.tokens, !!item.loose)}</span>`;
+            itemBody += `<span class="todo-list__label__description">${this.parser.parse(item.tokens.filter(t => t.type !== "checkbox"))}</span>`;
             return `<li><label class="todo-list__label">${itemBody}</label></li>`;
         }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 79a27b134..7871d528f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -272,8 +272,8 @@ importers:
         specifier: 8.11.1
         version: 8.11.1
       marked:
-        specifier: 16.4.2
-        version: 16.4.2
+        specifier: 17.0.0
+        version: 17.0.0
       mermaid:
         specifier: 11.12.1
         version: 11.12.1
@@ -715,8 +715,8 @@ importers:
         specifier: 1.6.0
         version: 1.6.0
       marked:
-        specifier: 16.4.2
-        version: 16.4.2
+        specifier: 17.0.0
+        version: 17.0.0
       mime-types:
         specifier: 3.0.1
         version: 3.0.1
@@ -10078,6 +10078,11 @@ packages:
     engines: {node: '>= 20'}
     hasBin: true
 
+  marked@17.0.0:
+    resolution: {integrity: sha512-KkDYEWEEiYJw/KC+DVm1zzlpMQSMIu6YRltkcCvwheCp8HWPXCk9JwOmHJKBlGfzcpzcIt6x3sMnTsRm/51oDg==}
+    engines: {node: '>= 20'}
+    hasBin: true
+
   marked@4.3.0:
     resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
     engines: {node: '>= 12'}
@@ -15478,6 +15483,8 @@ snapshots:
       '@ckeditor/ckeditor5-core': 47.2.0
       '@ckeditor/ckeditor5-upload': 47.2.0
       ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-ai@47.2.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)':
     dependencies:
@@ -15690,6 +15697,8 @@ snapshots:
       '@ckeditor/ckeditor5-utils': 47.2.0
       '@ckeditor/ckeditor5-watchdog': 47.2.0
       es-toolkit: 1.39.5
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-dev-build-tools@43.1.0(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.9.3)':
     dependencies:
@@ -15857,6 +15866,8 @@ snapshots:
       '@ckeditor/ckeditor5-utils': 47.2.0
       ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
       es-toolkit: 1.39.5
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-editor-classic@47.2.0':
     dependencies:
@@ -15866,6 +15877,8 @@ snapshots:
       '@ckeditor/ckeditor5-utils': 47.2.0
       ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
       es-toolkit: 1.39.5
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-editor-decoupled@47.2.0':
     dependencies:
@@ -15884,6 +15897,8 @@ snapshots:
       '@ckeditor/ckeditor5-utils': 47.2.0
       ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
       es-toolkit: 1.39.5
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-editor-multi-root@47.2.0':
     dependencies:
@@ -16480,6 +16495,8 @@ snapshots:
       '@ckeditor/ckeditor5-ui': 47.2.0
       '@ckeditor/ckeditor5-utils': 47.2.0
       ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-special-characters@47.2.0':
     dependencies:
@@ -16591,6 +16608,8 @@ snapshots:
       '@ckeditor/ckeditor5-icons': 47.2.0
       '@ckeditor/ckeditor5-ui': 47.2.0
       '@ckeditor/ckeditor5-utils': 47.2.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@ckeditor/ckeditor5-upload@47.2.0':
     dependencies:
@@ -22063,8 +22082,6 @@ snapshots:
   ckeditor5-collaboration@47.2.0:
     dependencies:
       '@ckeditor/ckeditor5-collaboration-core': 47.2.0
-    transitivePeerDependencies:
-      - supports-color
 
   ckeditor5-premium-features@47.2.0(bufferutil@4.0.9)(ckeditor5@47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41))(utf-8-validate@6.0.5):
     dependencies:
@@ -26528,6 +26545,8 @@ snapshots:
 
   marked@16.4.2: {}
 
+  marked@17.0.0: {}
+
   marked@4.3.0: {}
 
   matcher@3.0.0: