diff --git a/package.json b/package.json
index fc1716b72..1f0f2ce3a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "bootstrap-validator": "^0.11.8",
     "chance": "^1.0.4",
     "cheerio": "^0.22.0",
-    "codemirror": "git+https://github.com/hackmdio/CodeMirror.git",
+    "codemirror": "git+https://github.com/codimd/CodeMirror.git",
     "compression": "^1.6.2",
     "connect-flash": "^0.1.1",
     "connect-session-sequelize": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2c5910026..05b4c7f23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2363,7 +2363,7 @@ code-point-at@^1.0.0:
 
 "codemirror@git+https://github.com/codimd/CodeMirror.git":
   version "5.58.2"
-  resolved "git+https://github.com/codimd/CodeMirror.git#14d7274d417005fbce00f94c8e56a9568c7fb012"
+  resolved "git+https://github.com/codimd/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1"
 
 collapse-white-space@^1.0.2:
   version "1.0.6"