diff --git a/BizHawk.Client.Common/lua/LuaFunctionList.cs b/BizHawk.Client.Common/lua/LuaFunctionList.cs
index 8ed29aa574..aa535b19e1 100644
--- a/BizHawk.Client.Common/lua/LuaFunctionList.cs
+++ b/BizHawk.Client.Common/lua/LuaFunctionList.cs
@@ -42,16 +42,16 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void Clear()
+		public void Clear(IEmulator emulator)
 		{
-			if (Global.Emulator.InputCallbacksAvailable())
+			if (emulator.InputCallbacksAvailable())
 			{
-				Global.Emulator.AsInputPollable().InputCallbacks.RemoveAll(_functions.Select(w => w.Callback));
+				emulator.AsInputPollable().InputCallbacks.RemoveAll(_functions.Select(w => w.Callback));
 			}
 
-			if (Global.Emulator.MemoryCallbacksAvailable())
+			if (emulator.MemoryCallbacksAvailable())
 			{
-				var memoryCallbacks = Global.Emulator.AsDebuggable().MemoryCallbacks;
+				var memoryCallbacks = emulator.AsDebuggable().MemoryCallbacks;
 				memoryCallbacks.RemoveAll(_functions.Select(w => w.MemCallback));
 			}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index 8688393780..6192ab01d2 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -170,7 +170,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public override void Close()
 		{
-			RegisteredFunctions.Clear();
+			RegisteredFunctions.Clear(Global.Emulator); // TODO: don't use globals
 			FormsLibrary.DestroyAll();
 			_lua.Close();
 			_lua = new Lua();
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 52d1241a8d..365c4bf544 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -1257,7 +1257,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ClearRegisteredFunctionsContextMenuItem_Click(object sender, EventArgs e)
 		{
-			LuaImp.RegisteredFunctions.Clear();
+			LuaImp.RegisteredFunctions.Clear(Emulator);
 		}
 
 		#endregion