diff --git a/include/api.php b/include/api.php
index b93f8cf72a..8ef0d9bcea 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2447,18 +2447,18 @@
 							'religion' => $profile['religion'],
 							'public_keywords' => $profile['pub_keywords'],
 							'private_keywords' => $profile['prv_keywords'],
-							'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, true),
-							'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, true),
-							'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, true),
-							'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, true),
-							'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, true),
-							'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, true),
-							'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, true),
-							'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, true),
-							'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, true),
-							'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, true),
-							'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, true),
-							'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, true),
+							'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, false),
+							'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, false),
+							'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, false),
+							'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, false),
+							'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, false),
+							'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, false),
+							'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, false),
+							'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, false),
+							'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, false),
+							'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, false),
+							'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, false),
+							'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, false),
 							'homepage' => $profile['homepage'],
 							'users' => null);
 			return $profile;
diff --git a/mod/proxy.php b/mod/proxy.php
index abcaf49127..2cc798cdca 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -248,7 +248,7 @@ function proxy_url($url, $writemode = false, $size = "") {
 		return($url);
 	}
 
-	if (get_config("system", "proxy_disabled"))
+	if (get_config("system", "proxy_disabled") || $a->module == "api")
 		return($url);
 
 	// Creating a sub directory to reduce the amount of files in the cache directory