diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 9a9cd879db2..27a55aaba2e 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8615,7 +8615,7 @@ function getremoteaddr($default='0.0.0.0') {
     if (!($variablestoskip & GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR)) {
         if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
             $hdr = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']);
-            $address = $hdr[0];
+            $address = cleanremoteaddr($hdr[0]);
             return $address ? $address : $default;
         }
     }