diff --git a/src/BizHawk.Client.Common/Api/BasicApiProvider.cs b/src/BizHawk.Client.Common/Api/BasicApiProvider.cs
index 1b01a466de..95d8f1cb51 100644
--- a/src/BizHawk.Client.Common/Api/BasicApiProvider.cs
+++ b/src/BizHawk.Client.Common/Api/BasicApiProvider.cs
@@ -13,7 +13,12 @@ namespace BizHawk.Client.Common
 
 		public BasicApiProvider(ApiContainer apiContainer) => Container = apiContainer;
 
-		public object? GetApi(Type t) => Container.Libraries.TryGetValue(t, out var api) ? api : null;
+		public object? GetApi(Type t)
+			=> Container.Libraries.TryGetValue(t, out var api)
+				? api
+				: t == typeof(ApiContainer)
+					? Container
+					: null;
 
 		public bool HasApi(Type t) => Container.Libraries.ContainsKey(t);
 	}