diff --git a/gp-populate-anything/gppa-force-rehydration-on-edit.php b/gp-populate-anything/gppa-force-rehydration-on-edit.php
index d59e8e382..830855549 100644
--- a/gp-populate-anything/gppa-force-rehydration-on-edit.php
+++ b/gp-populate-anything/gppa-force-rehydration-on-edit.php
@@ -5,7 +5,7 @@
  */
 add_filter( 'gform_get_field_value', function( $value, $entry, $field ) {
 	static $_gppa_forcing_hydration;
-	if ( GFForms::get_page() === 'entry_detail_edit' && ! $_gppa_forcing_hydration ) {
+	if ( GFForms::get_page() === 'entry_detail_edit' && ! $_gppa_forcing_hydration && gp_populate_anything()->is_field_dynamically_populated( $field ) ) {
 		$_gppa_forcing_hydration = true;
 		$hydrated_field          = gp_populate_anything()->hydrate_field( $field, GFAPI::get_form( $field->formId ), $entry, $entry );
 		$value                   = $hydrated_field['field_value'];