diff --git a/plugins/codemirror-editor b/plugins/codemirror-editor
index 3afc9b3..06719ab 160000
--- a/plugins/codemirror-editor
+++ b/plugins/codemirror-editor
@@ -1 +1 @@
-Subproject commit 3afc9b32d26c761d67b21256792720d5c8916b43
+Subproject commit 06719abee6c38d17008599f074050db5153bffa3
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
index 5228bc9..0be3ab5 100644
--- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
+++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
@@ -2118,7 +2118,9 @@
         : this._getFileInRevision(changeNum, path, patchNum, suppress404s);
 
     return promise.then(res => {
-      if (!res.ok) {
+      // A 204 is returned if the file is empty so we have
+      // to return early.
+      if (!res.ok || res.status === 204) {
         return res;
       }