diff --git a/lib/classes/Request.php b/lib/classes/Request.php
index f2ff99afa2064f44ce01ff66a870af054d368f3b..10758f673ca52b1acfb5b0fadd7a727e6f7440a1 100644
--- a/lib/classes/Request.php
+++ b/lib/classes/Request.php
@@ -191,18 +191,18 @@ class Request implements ArrayAccess, IteratorAggregate
     /**
      * Return the value of the selected query parameter as an I18NString.
      *
-     * @param string   $param    parameter name
-     * @param string   $default  default value if parameter is not set
-     * @param Callable $op       Operation to perform on each text string
+     * @param string          $param   parameter name
+     * @param I18NString|null $default default value if parameter is not set
+     * @param callable|null   $op      Operation to perform on each text string
      *
      * @return I18NString  parameter value as string (if set), else NULL
      */
-    public static function i18n($param, $default = NULL, Callable $op = null)
+    public static function i18n(string $param, ?I18NString $default = NULL, Callable $op = null)
     {
-        $value = self::get($param, $default);
+        $value = self::get($param, $default ? $default->original() : null);
 
         if (isset($value)) {
-            $lang = self::getArray($param . '_i18n');
+            $lang = self::getArray($param . '_i18n') ?: ($default ? $default->toArray() : []);
 
             if ($op) {
                 $value = $op($value);