diff --git a/extension/Classes/Core/Store/Config.php b/extension/Classes/Core/Store/Config.php
index ee5127d9798d2e5c7e01ca6d7c55aa4f635d5386..1edcff01ca83cb4716c753ef64337bd4eb07d62e 100644
--- a/extension/Classes/Core/Store/Config.php
+++ b/extension/Classes/Core/Store/Config.php
@@ -308,6 +308,12 @@ class Config {
                     $maxLength = $arr[$cnt - 1];
                 } else {
                     $maxLength = $config[SYSTEM_SECURITY_GET_MAX_LENGTH]; // might change again.
+                    if(isset($GLOBALS["typeAhead"]) && $key===TYPEAHEAD_API_QUERY){
+                        // In case $key=='query' and we're called via API/typeahead.php: extend the default maxlength;
+                        if($maxLength<512) {
+                            $maxLength = 512;
+                        }
+                    }
                 }
 
                 $len = strlen($value);