diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 968c9762cc..8e571de379 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -510,29 +510,6 @@ class acp_board
 			}
 		}
 
-		if ($mode == 'avatar' && $cfg_array['allow_avatar_upload'])
-		{
-			// If avatar uploading is enabled but the path setting is empty,
-			// config variable validation is bypassed. Catch the case here
-			if (!$cfg_array['avatar_path'])
-			{
-				$error[] = $language->lang('AVATAR_NO_UPLOAD_PATH');
-			}
-			else if (!$submit)
-			{
-				$filesystem = $phpbb_container->get('filesystem');
-				$avatar_path_exists = $filesystem->exists($phpbb_root_path . $cfg_array['avatar_path']);
-				$avatar_path_writable = $filesystem->is_writable($phpbb_root_path . $cfg_array['avatar_path']);
-
-				// Not existing or writable path will be caught on submit by validate_config_vars().
-				// Display the warning if the directory was changed on the server afterwards
-				if (!$avatar_path_exists || !$avatar_path_writable)
-				{
-					$error[] = $language->lang('AVATAR_NO_UPLOAD_DIR');
-				}
-			}
-		}
-
 		// We validate the complete config if wished
 		validate_config_vars($display_vars['vars'], $cfg_array, $error);
 
diff --git a/tests/functional/acp_avatar_settings_test.php b/tests/functional/acp_avatar_settings_test.php
index 254459ad33..220233fb56 100644
--- a/tests/functional/acp_avatar_settings_test.php
+++ b/tests/functional/acp_avatar_settings_test.php
@@ -41,43 +41,5 @@ class phpbb_functional_acp_avatar_settings_test extends phpbb_functional_test_ca
 		]);
 		$crawler = self::submit($form);
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text());
-
-		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-
-		// Test empty avatar storage path while avatar uploading is enabled - invalid
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form([
-			'config[avatar_path]' => ''
-		]);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text());
-		$this->assertContainsLang('AVATAR_NO_UPLOAD_PATH', $crawler->filter('div[class="errorbox"] > p')->text());
-
-		// Test avatar upload path became not writable on the server afterwards
-		// Unix tests only
-		if (!defined('PHP_WINDOWS_VERSION_MAJOR'))
-		{
-			$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-			$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-			$values = $form->getValues();
-			$avatar_upload_path = $values['config[avatar_path]'];
-			$filesystem = new \phpbb\filesystem\filesystem;
-			// Make the directory not writable
-			global $phpbb_root_path;
-			$filesystem->chmod($phpbb_root_path . $avatar_upload_path, 444);
-			$this->assertFalse($filesystem->is_writable($phpbb_root_path . $avatar_upload_path));
-
-			// Visit Avatar ACP settings again - warning should be displayed
-			$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-			$this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text());
-			$this->assertContainsLang('AVATAR_NO_UPLOAD_DIR', $crawler->filter('div[class="errorbox"] > p')->text());
-			
-			// Restore default state
-			$filesystem->chmod($phpbb_root_path . $avatar_upload_path, 777);
-			$this->assertTrue($filesystem->is_writable($phpbb_root_path . $avatar_upload_path));
-
-			$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-			$this->assertNotContainsLang('AVATAR_NO_UPLOAD_DIR', $this->get_content());
-			$this->assertNotContainsLang('AVATAR_NO_UPLOAD_PATH', $this->get_content());
-		}
 	}
 }