diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index f7c8b244..16538d79 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -15,6 +15,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 
@@ -107,7 +108,7 @@ function forumdirectory_content(App $a)
 		$total = $cnt['total'];
 	}
 
-	$pager = new Pager($a->query_string, 60);
+	$pager = new Pager(DI::args()->getQueryString(), 60);
 
 	$order = " ORDER BY `name` ASC ";
 
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 31edfdca..dbcaf67d 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -151,7 +151,7 @@ function xmpp_converse(App $a)
 		return;
 	}
 
-	if (in_array($a->query_string, ["admin/federation/"])) {
+	if (in_array(DI::args()->getQueryString(), ["admin/federation/"])) {
 		return;
 	}