diff --git a/gravity-forms/gw-cache-buster.php b/gravity-forms/gw-cache-buster.php
index b389e72c9..533e5401b 100644
--- a/gravity-forms/gw-cache-buster.php
+++ b/gravity-forms/gw-cache-buster.php
@@ -9,7 +9,7 @@
  * Plugin URI:  https://gravitywiz.com/cache-busting-with-gravity-forms/
  * Description: Bypass your website cache when loading a Gravity Forms form.
  * Author:      Gravity Wiz
- * Version:     0.6.5
+ * Version:     0.6.6
  * Author URI:  https://gravitywiz.com
  */
 class GW_Cache_Buster {
@@ -104,8 +104,8 @@ public function shortcode( $markup, $attributes, $content ) {
 	}
 
 	public function form_filter( $markup, $form ) {
-		// Prevent recursion.
-		if ( rgar( $GLOBALS, 'processing' ) ) {
+		// Prevent recursion, and ensure we're not editing an entry via GP Entry Blocks.
+		if ( rgar( $GLOBALS, 'processing' ) || ( function_exists( 'gp_entry_blocks' ) && gp_entry_blocks()->block_edit_form->is_editing_entry( $form['id'] ) ) ) {
 			return $markup;
 		}