diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
index a36a1f40e6..eca34f0488 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Module;
+import net.runelite.client.RuneLite;
 
 public abstract class Plugin implements Module
 {
@@ -49,8 +50,20 @@ public abstract class Plugin implements Module
 	{
 	}
 
+	// This should never be null when we are using it
 	public final Injector getInjector()
 	{
+		if (injector == null)
+		{
+			Module pluginModule = (Binder binder) ->
+			{
+				binder.bind((Class<Plugin>) this.getClass()).toInstance(this);
+				binder.install(this);
+			};
+			Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
+			pluginInjector.injectMembers(this);
+			injector = pluginInjector;
+		}
 		return injector;
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 01c2d9ba7d..155b524c80 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -165,20 +165,7 @@ public class PluginManager
 		try
 		{
 			Injector injector = plugin.getInjector();
-			if (injector == null)
-			{
-				// Create injector for the module
-				Module pluginModule = (Binder binder) ->
-				{
-					// Since the plugin itself is a module, it won't bind itself, so we'll bind it here
-					binder.bind((Class<Plugin>) plugin.getClass()).toInstance(plugin);
-					binder.install(plugin);
-				};
-				Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
-				pluginInjector.injectMembers(plugin);
-				plugin.injector = pluginInjector;
-				injector = pluginInjector;
-			}
+
 			for (Key<?> key : injector.getBindings().keySet())
 			{
 				Class<?> type = key.getTypeLiteral().getRawType();
@@ -208,25 +195,7 @@ public class PluginManager
 			plugins = getPlugins();
 		}
 		plugins.forEach(pl ->
-		{
-			//TODO: Not sure why this is necessary but it is. The Injector isn't null when its handed off from our ExternalPluginManager.
-			//		Hopefully we can figure out the root cause of the underlying issue.
-			if (pl.injector == null)
-			{
-				// Create injector for the module
-				Module pluginModule = (Binder binder) ->
-				{
-					// Since the plugin itself is a module, it won't bind itself, so we'll bind it here
-					binder.bind((Class<Plugin>) pl.getClass()).toInstance(pl);
-					binder.install(pl);
-				};
-				Injector pluginInjector = RuneLite.getInjector().createChildInjector(pluginModule);
-				pluginInjector.injectMembers(pl);
-				pl.injector = pluginInjector;
-			}
-
-			injectors.add(pl.getInjector());
-		});
+			injectors.add(pl.getInjector()));
 
 		List<Config> list = new ArrayList<>();
 		for (Injector injector : injectors)