diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
index 7b8d793cf..1f8c46311 100644
--- a/monkey/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -87,7 +87,7 @@ class Configuration(object):
     # Configuration servers to try to connect to, in this order.
     command_servers = []
 
-    keep_tunnel_open_time = 60
+    keep_tunnel_open_time = 30
 
     ###########################
     # testing configuration
diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py
index e825a9098..86a0089ec 100644
--- a/monkey/monkey_island/cc/services/config_schema/internal.py
+++ b/monkey/monkey_island/cc/services/config_schema/internal.py
@@ -9,7 +9,7 @@ INTERNAL = {
                 "keep_tunnel_open_time": {
                     "title": "Keep tunnel open time",
                     "type": "integer",
-                    "default": 60,
+                    "default": 30,
                     "description": "Time to keep tunnel open before going down after last exploit "
                     "(in seconds)",
                 },