diff --git a/includes/extensions/edit-entry/class-edit-entry-render.php b/includes/extensions/edit-entry/class-edit-entry-render.php
index ede0618fe3..15b8035884 100644
--- a/includes/extensions/edit-entry/class-edit-entry-render.php
+++ b/includes/extensions/edit-entry/class-edit-entry-render.php
@@ -156,9 +156,6 @@ function load() {
 		// Disable conditional logic if needed (since 1.9)
 		add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
 
-		// Make sure GF doesn't validate max files (since 1.9)
-		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
-
 		// Add fields expected by GFFormDisplay::validate()
 		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
@@ -635,26 +632,6 @@ public function save_field_value( $value = '', $entry = array(), $field = null,
 		return $value;
 	}
 
-	/**
-	 * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
-	 * Late validation done on self::custom_validation
-	 *
-	 * @param $plupload_init array Plupload settings
-	 * @param $form_id
-	 * @param $instance
-	 * @return mixed
-	 */
-	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-		if ( ! $this->is_edit_entry() ) {
-			return $plupload_init;
-		}
-
-		$plupload_init['gf_vars']['max_files'] = 0;
-
-		return $plupload_init;
-	}
-
-
 	/**
 	 * Set visibility to visible and convert field input key to string
      *