diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
index 09cb7ca60..abdd9b99e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
@@ -37,6 +37,8 @@ import okhttp3.Response;
 public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	private static final String TAG="MastodonAPIRequest";
 
+	private static MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
+
 	private String domain;
 	private AccountSession account;
 	private String path;
@@ -95,14 +97,14 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 
 	public MastodonAPIRequest<T> execNoAuth(String domain){
 		this.domain=domain;
-		AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this);
+		unauthenticatedApiController.submitRequest(this);
 		return this;
 	}
 
 	public MastodonAPIRequest<T> exec(String domain, Token token){
 		this.domain=domain;
 		this.token=token;
-		AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this);
+		unauthenticatedApiController.submitRequest(this);
 		return this;
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
index 328bde9ac..0a3db0f1f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -72,7 +72,6 @@ public class AccountSessionManager{
 	private HashMap<String, List<EmojiCategory>> customEmojis=new HashMap<>();
 	private HashMap<String, Long> instancesLastUpdated=new HashMap<>();
 	private HashMap<String, Instance> instances=new HashMap<>();
-	private MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
 	private Instance authenticatingInstance;
 	private Application authenticatingApp;
 	private String lastActiveAccountID;
@@ -232,11 +231,6 @@ public class AccountSessionManager{
 		maybeUpdateShortcuts();
 	}
 
-	@NonNull
-	public MastodonAPIController getUnauthenticatedApiController(){
-		return unauthenticatedApiController;
-	}
-
 	public void authenticate(Activity activity, Instance instance){
 		authenticatingInstance=instance;
 		new CreateOAuthApp()