diff --git a/lib/antivirus/clamav/adminlib.php b/lib/antivirus/clamav/adminlib.php
index 488ce714a5d..c6d2aa130c4 100644
--- a/lib/antivirus/clamav/adminlib.php
+++ b/lib/antivirus/clamav/adminlib.php
@@ -155,6 +155,9 @@ class antivirus_clamav_tcpsockethost_setting extends antivirus_clamav_socket_set
         }
         $runningmethod = get_config('antivirus_clamav', 'runningmethod');
         $tcpport = get_config('antivirus_clamav', 'tcpsocketport');
+        if ($tcpport === false) {
+            $tcpport = 3310;
+        }
         if ($runningmethod === 'tcpsocket') {
             return $this->validate_clamav_socket('tcp://' . $data . ':' . $tcpport);
         }
diff --git a/lib/antivirus/clamav/classes/scanner.php b/lib/antivirus/clamav/classes/scanner.php
index 624abc4f122..2d0b7af6316 100644
--- a/lib/antivirus/clamav/classes/scanner.php
+++ b/lib/antivirus/clamav/classes/scanner.php
@@ -28,8 +28,8 @@ defined('MOODLE_INTERNAL') || die();
 
 /** Default socket timeout */
 define('ANTIVIRUS_CLAMAV_SOCKET_TIMEOUT', 10);
-/** Default socket data stream chunk size */
-define('ANTIVIRUS_CLAMAV_SOCKET_CHUNKSIZE', 1024);
+/** Default socket data stream chunk size (32Mb: 32*1024*"024) */
+define('ANTIVIRUS_CLAMAV_SOCKET_CHUNKSIZE', 33554432);
 
 /**
  * Class implementing ClamAV antivirus.