diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index 162ea0c..77d6387 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -55,7 +55,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @NotNull
   private static final Version VERSION;
-  private static TaskScheduler SCHEDULER;
+  private static TaskScheduler scheduler;
   private static PlaceholderAPIPlugin instance;
 
   static {
@@ -144,7 +144,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
   @Override
   public void onEnable() {
-    SCHEDULER = UniversalScheduler.getScheduler(this);
+    scheduler = UniversalScheduler.getScheduler(this);
     
     setupCommand();
     setupMetrics();
@@ -220,7 +220,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   }
 
   public static TaskScheduler getScheduler() {
-    return SCHEDULER;
+    return scheduler;
   }
 
   private void setupCommand() {
diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
index 19dc77c..7bfc7e3 100644
--- a/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
+++ b/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java
@@ -201,11 +201,9 @@ public final class CloudExpansionManager {
           }
 
           // loop through what's left on the main thread
-          plugin
-              .getServer()
+          PlaceholderAPIPlugin
               .getScheduler()
               .runTask(
-                  plugin,
                   () -> {
                     try {
                       for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {