diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index 37c16fb2c32..40fa2574f0e 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -1300,6 +1300,9 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	}
 
 	public static @Nullable SkriptAddon getAddon(JavaPlugin plugin) {
+		if (plugin == Skript.getInstance()) {
+			return Skript.getAddonInstance();
+		}
 		for (SkriptAddon addon : getAddons()) {
 			if (addon.plugin == plugin) {
 				return addon;
@@ -1309,6 +1312,9 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	}
 
 	public static @Nullable SkriptAddon getAddon(String name) {
+		if (name.equals(Skript.getInstance().getName())) {
+			return Skript.getAddonInstance();
+		}
 		for (SkriptAddon addon : getAddons()) {
 			if (addon.getName().equals(name)) {
 				return addon;
diff --git a/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java b/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
index f0065e734aa..fe337eaa30a 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
@@ -216,6 +216,10 @@ public ListeningBehavior getListeningBehavior() {
 	 * Registration API Compatibility
 	 */
 
+	/**
+	 * Internal wrapper class for providing compatibility with the new Registration API.
+	 */
+	@ApiStatus.Internal
 	@ApiStatus.Experimental
 	public static final class ModernSkriptEventInfo<E extends SkriptEvent>
 			extends SkriptEventInfo<E>