diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/Util.java b/modules/API/src/main/java/com/comphenix/protocol/utility/Util.java
index f6ef046d..1a460a0b 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/utility/Util.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/utility/Util.java
@@ -53,11 +53,11 @@ public class Util {
 	}
 
 	/**
-	 * Whether or not this server is running Spigot. This works by checking
-	 * the server version for the String "Spigot"
+	 * Whether or not this server is running Spigot or a Spigot fork. This works by checking
+	 * the server version for the Strings "Spigot" or "Paper".
 	 * @return True if it is, false if not.
 	 */
 	public static boolean isUsingSpigot() {
-		return Bukkit.getServer().getVersion().contains("Spigot");
+		return Bukkit.getServer().getVersion().contains("Spigot") || Bukkit.getServer().getVersion().contains("Paper");
 	}
 }