diff --git a/pkg/apps/integrations.go b/pkg/apps/integrations.go
index 85e8ad5e6..477b8a1e2 100644
--- a/pkg/apps/integrations.go
+++ b/pkg/apps/integrations.go
@@ -3,6 +3,7 @@ package apps
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/Notifiarr/notifiarr/pkg/apps/apppkg/plex"
 	"github.com/Notifiarr/notifiarr/pkg/apps/apppkg/sabnzbd"
@@ -23,6 +24,10 @@ type PlexConfig struct {
 }
 
 func (c *PlexConfig) Setup(maxBody int, logger mnd.Logger) {
+	if c.Timeout.Duration == 0 {
+		c.Timeout.Duration = time.Minute
+	}
+
 	if logger != nil && logger.DebugEnabled() {
 		c.Client = starr.ClientWithDebug(c.Timeout.Duration, c.ValidSSL, debuglog.Config{
 			MaxBody: maxBody,
@@ -54,6 +59,10 @@ func (c *TautulliConfig) Setup(maxBody int, logger mnd.Logger) {
 		return
 	}
 
+	if c.Timeout.Duration == 0 {
+		c.Timeout.Duration = time.Minute
+	}
+
 	if logger != nil && logger.DebugEnabled() {
 		c.Config.Client = starr.ClientWithDebug(c.Timeout.Duration, c.ValidSSL, debuglog.Config{
 			MaxBody: maxBody,
diff --git a/pkg/bindata/templates/media/plex.html b/pkg/bindata/templates/media/plex.html
index 6b8cff3be..60b2bfff1 100644
--- a/pkg/bindata/templates/media/plex.html
+++ b/pkg/bindata/templates/media/plex.html
@@ -126,7 +126,6 @@ <h2 class="mb-3" style="margin-bottom:-45px">Plex</h2>
                                                                 {{- end}}
                                                                 <select type="select" id="Plex.Timeout" name="Plex.Timeout" class="client-parameter form-control input-sm" data-group="media" data-label="Plex Timeout" data-original="{{.Config.Apps.Plex.Timeout}}">
                                                                     <option value="-1s" {{if eq $.Config.Apps.Plex.Timeout.Seconds (add -1 0)}}selected {{end}}>Disabled</option>
-                                                                    <option value="0s" {{if eq $.Config.Apps.Plex.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                                                                     {{- range $i := one259 }}
                                                                     <option {{if eq $.Config.Apps.Plex.Timeout.Seconds $i}}selected {{end}}value="{{$i}}s">{{$i}} second{{if not (eq $i (add 0 1))}}s{{end}}</option>
                                                                     {{- end}}
diff --git a/pkg/bindata/templates/media/tautulli.html b/pkg/bindata/templates/media/tautulli.html
index 92fecf640..0dcde8342 100644
--- a/pkg/bindata/templates/media/tautulli.html
+++ b/pkg/bindata/templates/media/tautulli.html
@@ -136,7 +136,6 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
                                                                 {{- end}}
                                                                 <select type="select" id="Apps.Tautulli.extraConfig.Timeout" name="Apps.Tautulli.extraConfig.Timeout" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli Timeout" data-original="{{.Config.Apps.Tautulli.Timeout}}">
                                                                     <option value="-1s" {{if eq $.Config.Tautulli.Timeout.Seconds (add -1 0)}}selected {{end}}>Disabled</option>
-                                                                    <option value="0s" {{if eq $.Config.Tautulli.Timeout.Seconds (add 0 0)}}selected {{end}}>No Timeout</option>
                                                                     {{- range $i := one259 }}
                                                                     <option {{if eq $.Config.Apps.Tautulli.Timeout.Seconds $i}}selected {{end}}value="{{$i}}s">{{$i}} second{{if not (eq $i (add 0 1))}}s{{end}}</option>
                                                                     {{- end}}