diff --git a/inc/api.php b/inc/api.php
index 11f51fe4..16844d32 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -45,13 +45,11 @@ class Api {
 		'size' => 'fsize'
 	];
 
-	public function __construct() {
-		global $config;
-
+	public function __construct(bool $show_filename, bool $hide_email, bool $country_flags) {
 		// Translation from local fields to fields in 4chan-style API
-		$this->show_filename = $config['show_filename'];
-		$this->hide_email = $config['hide_email'];
-		$this->country_flags = $config['country_flags'];
+		$this->show_filename = $show_filename;
+		$this->hide_email = $hide_email;
+		$this->country_flags = $country_flags;
 
 		$this->postFields = [
 			'id' => 'no',
diff --git a/inc/functions.php b/inc/functions.php
index 2cb97c50..c76ca10b 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1730,7 +1730,11 @@ function buildIndex($global_api = "yes") {
 	$antibot = null;
 
 	if ($config['api']['enabled']) {
-		$api = new Api();
+		$api = new Api(
+			$config['show_filename'],
+			$config['hide_email'],
+			$config['country_flags']
+		);
 		$catalog = array();
 	}
 
@@ -2388,7 +2392,11 @@ function buildThread($id, $return = false, $mod = false) {
 
 		// json api
 		if ($config['api']['enabled'] && !$mod) {
-			$api = new Api();
+			$api = new Api(
+				$config['show_filename'],
+				$config['hide_email'],
+				$config['country_flags']
+			);
 			$json = json_encode($api->translateThread($thread));
 			$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
 			file_write($jsonFilename, $json);