diff --git a/csgo/demo_loader.go b/csgo/demo_loader.go
index a33a60d..0c4e7e6 100644
--- a/csgo/demo_loader.go
+++ b/csgo/demo_loader.go
@@ -263,8 +263,11 @@ func (dml *DemoMatchLoader) connectLoop() {
 
 					if dml.connectionWait == 0 {
 						dml.connectionWait = 1
+					} else if dml.connectionWait > 20 {
+						dml.connectionWait = 20
+					} else {
+						dml.connectionWait *= 2
 					}
-					dml.connectionWait *= 2
 				}
 			case LOGIN_SUCCESS:
 				log.Infof("[DL] Steam login successfully restored after %d minutes", dml.connectionWait)
@@ -319,14 +322,8 @@ func (dml *DemoMatchLoader) steamEventHandler() {
 			}
 		case *steam.FatalErrorEvent:
 			log.Debugf("[DL] Got FatalError %+v", e)
-			dml.GCReady = false
-			dml.LoggedIn = false
-			dml.connectFeedback <- LOGIN_FAILED
 		case error:
 			log.Warningf("[DL] Error: %+v", e)
-			dml.GCReady = false
-			dml.LoggedIn = false
-			dml.connectFeedback <- LOGIN_FAILED
 		default:
 			log.Debugf("[DL] %T: %v", e, e)
 		}