diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
index 512568f..9460202 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
@@ -89,6 +89,11 @@ class PlayerConnection implements Listener {
 			event.allow();
 		}
 		
+		if (event.getResult() == Result.KICK_FULL &&
+			JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("allowJoinOnFullServer")) {
+			event.allow();
+		}
+		
 		if (JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("opOnJoin")) {
 			player.setOp(true);
 		}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 77f0e82..b1f28e9 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,4 +1,5 @@
 # Player connection
+allowJoinOnFullServer: true
 enableKick: false
 enableJoinRestrictions: false
 opOnJoin: true