diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 592153fa492d..0e1b80833633 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -9,6 +9,10 @@
 * [**] Disabled the ability of creating new Story posts. [#20014]
 * [**] Disable Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20005]
 
+24.0.2
+-----
+* [**] Fix Aztec editor crash when losing or gaining network connectivity [https://github.com/wordpress-mobile/WordPress-Android/pull/20053]
+
 24.0.1
 -----
 * [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563]
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index 5e138f5f1b1e..1604569719e9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -71,6 +71,7 @@
 import org.wordpress.android.editor.EditorMediaUtils;
 import org.wordpress.android.editor.EditorThemeUpdateListener;
 import org.wordpress.android.editor.ExceptionLogger;
+import org.wordpress.android.editor.gutenberg.GutenbergNetworkConnectionListener;
 import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase;
 import org.wordpress.android.editor.gutenberg.DialogVisibility;
 import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment;
@@ -3835,6 +3836,8 @@ public void onEventMainThread(UploadService.UploadMediaRetryEvent event) {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(ConnectionChangeReceiver.ConnectionChangeEvent event) {
+        if (!(mEditorFragment instanceof GutenbergNetworkConnectionListener)) return;
+
         ((GutenbergEditorFragment) mEditorFragment).onConnectionStatusChange(event.isConnected());
     }
 
diff --git a/version.properties b/version.properties
index d5b33840b1fa..677e9c3a4ea9 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 versionName=24.1-rc-2
-versionCode=1403
\ No newline at end of file
+versionCode=1404