diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 9bd8cedd6..94d83a444 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -345,7 +345,7 @@ sethome-multiple:
 
 # Set timeout in seconds for players to accept tpa before request is cancelled.
 # Set to 0 for no timeout
-tpa-accept-cancellation: 0
+tpa-accept-cancellation: 120
 
 ############################################################
 # +------------------------------------------------------+ #
diff --git a/Essentials/src/net/ess3/settings/commands/Teleport.java b/Essentials/src/net/ess3/settings/commands/Teleport.java
index 6c6bdca06..ffa576410 100644
--- a/Essentials/src/net/ess3/settings/commands/Teleport.java
+++ b/Essentials/src/net/ess3/settings/commands/Teleport.java
@@ -14,7 +14,7 @@ public class Teleport implements StorageObject
 			{
 					"Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout."
 			})
-	private int requestTimeout = 0;
+	private int requestTimeout = 120;
 	@Comment({"Cancels a request made by tpa / tphere on world change to prevent cross world tp"})
 	private boolean cancelRequestsOnWorldChange = false;
 	@Comment(