diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java
index 5d44516..a130761 100644
--- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java
+++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java
@@ -14,7 +14,8 @@ public class PlayerDeath implements Listener {
   public void onPlayerDeath(PlayerRespawnEvent ev) {
     final Player p = ev.getPlayer();
     if (p.hasPermission("multispawn.noteleportondeath") // If player is excluded
-      || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty
+        || !plugin.getConfig().getBoolean("teleportOnDeath") // If disabled in config.yml
+        || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty
       
     if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1
       && plugin.getSpawnUtils().getSpawns(p, true).contains("default")
diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java
index ea7226c..3737afb 100644
--- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java
+++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java
@@ -16,6 +16,7 @@ public class PlayerJoin implements Listener {
   public void onPlayerJoin(PlayerJoinEvent ev) {
     final Player p = ev.getPlayer();
     if (p.hasPermission("multispawn.noteleport") // If player is excluded
+        || !plugin.getConfig().getBoolean("teleportOnJoin") // If disabled in config.yml
         || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty
   
     if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 874e910..3e53316 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,3 +1,6 @@
 spawns: []
 useDefaultAsFallback: true # If the player has no permissions, use the spawn named 'default'
 configversion: 1
+
+teleportOnJoin: true
+teleportOnDeath: false