diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php
index 5d2b462a9d..72bb11bdb9 100644
--- a/classes/helpers/FrmFieldsHelper.php
+++ b/classes/helpers/FrmFieldsHelper.php
@@ -1599,6 +1599,9 @@ public static function switch_field_ids( $val ) {
 			$replace_with[] = 'field_id="' . $new . '"';
 			$replace[]      = 'field_id=\"' . $old . '\"';
 			$replace_with[] = 'field_id=\"' . $new . '\"';
+			// This covers conditional logic.
+			$replace[]      = '_field":"' . $old . '","';
+			$replace_with[] = '_field":"' . $new . '","';
 			unset( $old, $new );
 		}//end foreach
 		if ( is_array( $val ) ) {