diff --git a/tuner.c b/tuner.c
index c6ff97b..e796f54 100644
--- a/tuner.c
+++ b/tuner.c
@@ -83,7 +83,7 @@ size_t cSatipTuner::HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void
            int timeout = -1;
            char *session = NULL;
            if (sscanf(r, "Session:%m[^;];timeout=%11d", &session, &timeout) == 2)
-              obj->SetSessionTimeout(skipspace(session), (timeout - 1) * 1000);
+              obj->SetSessionTimeout(skipspace(session), timeout * 1000);
            else if (sscanf(r, "Session:%m[^;]", &session) == 1)
               obj->SetSessionTimeout(skipspace(session));
            FREE_POINTER(session);
diff --git a/tuner.h b/tuner.h
index 0f07351..c21535e 100644
--- a/tuner.h
+++ b/tuner.h
@@ -26,10 +26,10 @@
 class cSatipTuner : public cThread, public cSatipTunerStatistics {
 private:
   enum {
-    eConnectTimeoutMs       = 1500,   // in milliseconds
-    ePidUpdateIntervalMs    = 100,    // in milliseconds
-    eReConnectTimeoutMs     = 5000,   // in milliseconds
-    eMinKeepAliveIntervalMs = 300000  // in milliseconds
+    eConnectTimeoutMs       = 1500,  // in milliseconds
+    ePidUpdateIntervalMs    = 100,   // in milliseconds
+    eReConnectTimeoutMs     = 5000,  // in milliseconds
+    eMinKeepAliveIntervalMs = 30000  // in milliseconds
   };
 
   static size_t HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);