diff --git a/src/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java b/src/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
index 1c2f1c5b..ab5efb2b 100644
--- a/src/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
+++ b/src/com/massivecraft/factions/integration/placeholderapi/IntegrationPlaceholderAPI.java
@@ -1,7 +1,6 @@
 package com.massivecraft.factions.integration.placeholderapi;
 
 import com.massivecraft.massivecore.Integration;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -27,7 +26,7 @@ public class IntegrationPlaceholderAPI extends Integration
 	@Override
 	public void setIntegrationActiveInner(boolean active)
 	{
-		PlaceholderAPIPlugin.getInstance().getExpansionManager().registerExpansion(PlaceholderFactions.get());
+		PlaceholderFactions.get().register();
 	}
 
 	public static void ensureRegistered()
@@ -45,7 +44,7 @@ public class IntegrationPlaceholderAPI extends Integration
 		if (str.startsWith("/")) str = str.substring(1);
 
 		if (!str.startsWith("papi")) return;
-		Bukkit.getScheduler().runTaskLater(this.getPlugin(), IntegrationPlaceholderAPI::ensureRegistered, 20L);
+		Bukkit.getScheduler().runTaskLater(this.getPlugin(), IntegrationPlaceholderAPI::ensureRegistered, 10L);
 	}