diff --git a/pom.xml b/pom.xml
index cb10f1f..070259a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>mineverse.Aust1n46.chat</groupId>
     <artifactId>VentureChat</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
     <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>
     <scm>
         <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>
@@ -115,8 +115,18 @@
             <id>velocity</id>
             <url>https://repo.velocitypowered.com/snapshots/</url>
         </repository>
+        <repository>
+    		<id>papermc</id>
+    		<url>https://papermc.io/repo/repository/maven-public/</url>
+		</repository>
     </repositories>
     <dependencies>
+    	<dependency>
+    		<groupId>io.papermc.paper</groupId>
+    		<artifactId>paper-api</artifactId>
+    		<version>1.17.1-R0.1-SNAPSHOT</version>
+    		<scope>provided</scope>
+		</dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/LoginListener.java b/src/main/java/mineverse/Aust1n46/chat/listeners/LoginListener.java
index 1cd2796..b940d15 100644
--- a/src/main/java/mineverse/Aust1n46/chat/listeners/LoginListener.java
+++ b/src/main/java/mineverse/Aust1n46/chat/listeners/LoginListener.java
@@ -85,15 +85,20 @@ public class LoginListener implements Listener {
 				mcp.addListening(ch.getName());
 			}
 		}
-
-		if(plugin.getServer().spigot().getConfig().getBoolean("settings.bungeecord")) {
-			long delayInTicks = 20L;
-			final MineverseChatPlayer sync = mcp;
-			plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-				public void run() {
-					MineverseChat.synchronize(sync, false);
-				}
-			}, delayInTicks);
+		
+		try {
+			if(plugin.getServer().spigot().getPaperConfig().getBoolean("settings.velocity-support.enabled") || plugin.getServer().spigot().getConfig().getBoolean("settings.bungeecord")) {
+				long delayInTicks = 20L;
+				final MineverseChatPlayer sync = mcp;
+				plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+					public void run() {
+						MineverseChat.synchronize(sync, false);
+					}
+				}, delayInTicks);
+			}
+		}
+		catch(NoSuchMethodError exception) { // Thrown if server isn't Paper.
+			// Do nothing
 		}
 	}
 }