diff --git a/CHANGELOG.md b/CHANGELOG.md
index d33936bc..164442dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * Added deletion of `*.pyc` files to `python setup.py clean` command, should help tremendously when switching branches (backported
   from [9e014eb](https://github.com/foosel/OctoPrint/commit/9e014eba1feffde11ed0601d9c911b8cac9f3fb0))
+* Increased default communication and connection timeouts
 
 ### Bug Fixes
 
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index 259edaac..db912c56 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -30,8 +30,8 @@ default_settings = {
 		"log": False,
 		"timeout": {
 			"detection": 0.5,
-			"connection": 2,
-			"communication": 5,
+			"connection": 10,
+			"communication": 30,
 			"temperature": 5,
 			"sdStatus": 1
 		},