diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 3bcf7c3d9bf4..901f0c1b5d8b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -9,6 +9,7 @@
 * Post List: Unsaved changes are automatically backed up on all devices. On post opening, the app will let you choose which version you prefer.
 * Clicking on "Publish" on a private post sometimes published the post as public
 * Fixed a bunch of upload related issues
+* Block editor: Fix a link editing issue, where trying to add a empty link at the start of another link would remove the existing link.
 
 13.3
 -----
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
index f06f1f3071d8..bce5f4a227da 100644
--- a/libs/editor/WordPressEditor/build.gradle
+++ b/libs/editor/WordPressEditor/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     ext {
-        aztecVersion = 'v1.3.30'
+        aztecVersion = 'v1.3.31'
     }
 
     dependencies {
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
index 976f677851ed..3befe746a5dd 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
@@ -106,7 +106,7 @@ public void setContent(String postContent) {
     public void toggleHtmlMode() {
         mHtmlModeEnabled = !mHtmlModeEnabled;
 
-        mWPAndroidGlueCode.toggleEditorMode();
+        mWPAndroidGlueCode.toggleEditorMode(mHtmlModeEnabled);
     }
 
     /**
diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
index ad9edc1d69d9..d2ab27218f14 160000
--- a/libs/gutenberg-mobile
+++ b/libs/gutenberg-mobile
@@ -1 +1 @@
-Subproject commit ad9edc1d69d9e422a9044bd6a72b5dfed30916e4
+Subproject commit d2ab27218f14b76740099131d1e91f58b9342df9