diff --git a/src/Pods/Tools/Repair.php b/src/Pods/Tools/Repair.php
index 835a636e37..0fe579c2c9 100644
--- a/src/Pods/Tools/Repair.php
+++ b/src/Pods/Tools/Repair.php
@@ -84,8 +84,8 @@ public function repair_groups_and_fields_for_pod( Pod $pod, $mode ) {
 		// Maybe fix fields with invalid field type.
 		$results[ __( 'Fixed fields with invalid field type', 'pods' ) ] = $this->maybe_fix_fields_with_invalid_field_type( $pod, $mode );
 
-		// Maybe fix fields with invalid conditional logic.
-		$results[ __( 'Fixed fields with invalid conditional logic', 'pods' ) ] = $this->maybe_fix_fields_with_invalid_conditional_logic( $pod, $mode );
+		// Maybe fix fields with invalid arguments.
+		$results[ __( 'Fixed fields with invalid arguments', 'pods' ) ] = $this->maybe_fix_fields_with_invalid_args( $pod, $mode );
 
 		// Check if changes were made to the Pod.
 		$changes_made = [] !== array_filter( $results );
@@ -752,7 +752,7 @@ protected function maybe_fix_fields_with_invalid_field_type( Pod $pod, $mode ) {
 	}
 
 	/**
-	 * Maybe fix fields with invalid conditional logic.
+	 * Maybe fix pod fields with invalid arguments.
 	 *
 	 * @since 3.0.4
 	 *
@@ -761,12 +761,13 @@ protected function maybe_fix_fields_with_invalid_field_type( Pod $pod, $mode ) {
 	 *
 	 * @return string[] The label, name, and ID for each field fixed.
 	 */
-	protected function maybe_fix_fields_with_invalid_conditional_logic( Pod $pod, $mode ) {
+	protected function maybe_fix_fields_with_invalid_args( Pod $pod, $mode ) {
 		$this->setup();
 
 		$invalid_args = [
 			'conditional_logic',
 			'attributes',
+			'grouped',
 			'depends-on',
 			'depends-on-any',
 			'depends-on-multi',
@@ -795,7 +796,7 @@ protected function maybe_fix_fields_with_invalid_conditional_logic( Pod $pod, $m
 			] );
 
 			foreach ( $fields as $field ) {
-				$fixed_field = $this->maybe_fix_fields_with_invalid_conditional_logic_for_field( $pod, $field, $invalid_arg, $mode );
+				$fixed_field = $this->maybe_fix_fields_with_invalid_args_for_field( $pod, $field, $invalid_arg, $mode );
 
 				if ( $fixed_field ) {
 					$fixed_fields[] = $fixed_field;
@@ -807,7 +808,7 @@ protected function maybe_fix_fields_with_invalid_conditional_logic( Pod $pod, $m
 	}
 
 	/**
-	 * Maybe fix a field with invalid conditional logic.
+	 * Maybe fix a field with invalid arguments.
 	 *
 	 * @since 3.0.4
 	 *
@@ -818,7 +819,7 @@ protected function maybe_fix_fields_with_invalid_conditional_logic( Pod $pod, $m
 	 *
 	 * @return string[]|false The label, name, and ID for the field fixed, or false if not fixed.
 	 */
-	protected function maybe_fix_fields_with_invalid_conditional_logic_for_field( Pod $pod, Field $field, string $invalid_arg, $mode ) {
+	protected function maybe_fix_fields_with_invalid_args_for_field( Pod $pod, Field $field, string $invalid_arg, $mode ) {
 		$this->setup();
 
 		$field_id = $field->get_id();
@@ -830,6 +831,7 @@ protected function maybe_fix_fields_with_invalid_conditional_logic_for_field( Po
 		$invalid_args = [
 			'conditional_logic',
 			'attributes',
+			'grouped',
 			'depends-on',
 			'depends-on-any',
 			'depends-on-multi',
@@ -838,7 +840,9 @@ protected function maybe_fix_fields_with_invalid_conditional_logic_for_field( Po
 		];
 
 		try {
-			$found_invalid_args = [];
+			$found_invalid_args = [
+				$invalid_arg => null,
+			];
 
 			foreach ( $invalid_args as $other_invalid_arg ) {
 				$arg_value = $field->get_arg( $other_invalid_arg, null, false, true );
@@ -871,6 +875,8 @@ protected function maybe_fix_fields_with_invalid_conditional_logic_for_field( Po
 
 					$field->set_arg( $found_invalid_arg, null );
 				}
+
+				pods_api()->cache_flush_fields();
 			}
 
 			return sprintf(
diff --git a/ui/admin/settings-tools.php b/ui/admin/settings-tools.php
index a0b7f01979..858812820f 100644
--- a/ui/admin/settings-tools.php
+++ b/ui/admin/settings-tools.php
@@ -78,6 +78,7 @@
 	<li><?php esc_html_e( 'All orphaned Fields that belong to a Group that no longer exists will be auto-assigned to the first available Group', 'pods' ); ?></li>
 	<li><?php esc_html_e( 'All orphaned Fields that do not belong to a Group will be auto-assigned to the first available Group', 'pods' ); ?></li>
 	<li><?php esc_html_e( 'All Fields that have an invalid Field type set will be changed to Plain Text', 'pods' ); ?></li>
+	<li><?php esc_html_e( 'All Fields that have invalid arguments set will have those arguments removed (conditional logic saved with serialized data and other arguments not intended for the DB used by early Pods 2.x releases)', 'pods' ); ?></li>
 </ul>
 
 <?php