diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt
index 5d71119..053a3fc 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt
@@ -26,7 +26,6 @@ import org.bukkit.plugin.RegisteredListener
 import xyz.alexcrea.cuanvil.dependency.DependencyManager
 import xyz.alexcrea.cuanvil.dependency.packet.NoPacketManager
 import xyz.alexcrea.cuanvil.dependency.packet.ProtocoLibWrapper
-import xyz.alexcrea.cuanvil.dependency.packet.versions.PaperPacketManager
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry
 import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
 import xyz.alexcrea.cuanvil.util.MetricsUtil
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
index f38b9e4..775d197 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
@@ -8,14 +8,22 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil
 import xyz.alexcrea.cuanvil.update.UpdateUtils
 
 object PacketManagerSelector {
+
+    private const val PAPER_CRAFT_PLAYER_CLASS = "org.bukkit.craftbukkit.entity.CraftPlayer"
+
     fun selectPacketManager(forceProtocolib: Boolean): PacketManager {
         // Try to find version
         return if (forceProtocolib)
             protocolibIfPresent
-        else
-            reobfPacketManager ?:
-            if(PlatformUtil.isPaper) PaperPacketManager()
-            else protocolibIfPresent
+        else {
+            try {
+                Class.forName(PAPER_CRAFT_PLAYER_CLASS)
+
+                return PaperPacketManager()
+            } catch (_: ClassNotFoundException) {
+                return reobfPacketManager ?: protocolibIfPresent
+            }
+        }
     }
 
     private val protocolibIfPresent: PacketManager