diff --git a/components/Collection/Util/Controller/Collection.php b/components/Collection/Util/Controller/Collection.php
index 2881bb8502..da8e5ac04f 100644
--- a/components/Collection/Util/Controller/Collection.php
+++ b/components/Collection/Util/Controller/Collection.php
@@ -14,7 +14,7 @@ class Collection extends Controller
     public function query(string $query, ?string $locale = null, ?Actor $actor = null)
     {
         $actor  ??= Common::actor();
-        $locale ??= $actor?->getTopLanguage()?->getLocale();
+        $locale ??= $actor?->getTopLanguage()?->getLocale() ?? Common::currentLanguage()->getLocale();
         return CollectionModule::query($query, $this->int('page') ?? 1, $locale, $actor);
     }
 }
diff --git a/src/Util/Common.php b/src/Util/Common.php
index 5d76449cf3..37633de783 100644
--- a/src/Util/Common.php
+++ b/src/Util/Common.php
@@ -323,6 +323,6 @@ abstract class Common
 
     public static function currentLanguage(): Language
     {
-        return self::actor()?->getTopLanguage() ?? Language::getByLocale(!\is_null(self::$request->headers->get('accept-language')) ? I18n::clientPreferredLanguage(self::$request->headers->get('accept-language')) : self::config('site', 'language'));
+        return self::actor()?->getTopLanguage() ?? Language::getByLocale(self::$request->headers->has('accept-language') ? I18n::clientPreferredLanguage(self::$request->headers->get('accept-language')) : self::config('site', 'language'));
     }
 }