diff --git a/apps/server/src/services/import/mime.ts b/apps/server/src/services/import/mime.ts
index 9b9895ea9..479bd3494 100644
--- a/apps/server/src/services/import/mime.ts
+++ b/apps/server/src/services/import/mime.ts
@@ -16,6 +16,7 @@ const CODE_MIME_TYPES = new Set([
     "text/x-c++src",
     "text/x-csrc",
     "text/x-dockerfile",
+    "text/x-elixir",
     "text/x-erlang",
     "text/x-feature",
     "text/x-go",
@@ -55,6 +56,8 @@ const EXTENSION_TO_MIME = new Map<string, string>([
     [".cs", "text/x-csharp"],
     [".clj", "text/x-clojure"],
     [".erl", "text/x-erlang"],
+    [".ex", "text/x-elixir"],
+    [".exs", "text/x-elixir"],
     [".hrl", "text/x-erlang"],
     [".feature", "text/x-feature"],
     [".go", "text/x-go"],
diff --git a/apps/server/src/services/options_init.ts b/apps/server/src/services/options_init.ts
index 4126ed321..b81507999 100644
--- a/apps/server/src/services/options_init.ts
+++ b/apps/server/src/services/options_init.ts
@@ -98,7 +98,7 @@ const defaultOptions: DefaultOption[] = [
     { name: "codeLineWrapEnabled", value: "true", isSynced: false },
     {
         name: "codeNotesMimeTypes",
-        value: '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-sqlite;schema=trilium","text/x-swift","text/xml","text/x-yaml","text/x-sh","application/typescript"]',
+        value: '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-elixir","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-sqlite;schema=trilium","text/x-swift","text/xml","text/x-yaml","text/x-sh","application/typescript"]',
         isSynced: true
     },
     { name: "leftPaneWidth", value: "25", isSynced: false },
diff --git a/packages/commons/src/lib/mime_type.ts b/packages/commons/src/lib/mime_type.ts
index c2b3b2a62..ba6deafc8 100644
--- a/packages/commons/src/lib/mime_type.ts
+++ b/packages/commons/src/lib/mime_type.ts
@@ -69,6 +69,7 @@ export const MIME_TYPES_DICT: readonly MimeTypeDefinition[] = Object.freeze([
     { title: "ECL", mime: "text/x-ecl" },
     { title: "edn", mime: "application/edn" },
     { title: "Eiffel", mime: "text/x-eiffel" },
+    { title: "Elixir", mime: "text/x-elixir", mdLanguageCode: "elixir" },
     { title: "Elm", mime: "text/x-elm", mdLanguageCode: "elm" },
     { title: "Embedded Javascript", mime: "application/x-ejs" },
     { title: "Embedded Ruby", mime: "application/x-erb", mdLanguageCode: "erb" },
diff --git a/packages/highlightjs/src/syntax_highlighting.ts b/packages/highlightjs/src/syntax_highlighting.ts
index f91f580e9..dc94d6303 100644
--- a/packages/highlightjs/src/syntax_highlighting.ts
+++ b/packages/highlightjs/src/syntax_highlighting.ts
@@ -64,6 +64,7 @@ const byMimeType: MimeRecord = {
     "text/x-ebnf": () => import("highlight.js/lib/languages/ebnf"),
     "text/x-ecl": null,
     "text/x-eiffel": null,
+    "text/x-elixir": () => import("highlight.js/lib/languages/elixir"),
     "text/x-elm": () => import("highlight.js/lib/languages/elm"),
     "text/x-erlang": () => import("highlight.js/lib/languages/erlang"),
     "text/x-esper": null,