diff --git a/conf/configuration.go b/conf/configuration.go
index 11aad98d7..69a57471b 100644
--- a/conf/configuration.go
+++ b/conf/configuration.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/log"
@@ -15,10 +16,10 @@ type nd struct {
 	Port                    int
 	MusicFolder             string
 	DataFolder              string
-	ScanInterval            string
 	DbPath                  string
 	LogLevel                string
-	SessionTimeout          string
+	ScanInterval            time.Duration
+	SessionTimeout          time.Duration
 	BaseURL                 string
 	UILoginBackgroundURL    string
 	IgnoredArticles         string
@@ -65,8 +66,8 @@ func SetDefaults() {
 	viper.SetDefault("datafolder", "./")
 	viper.SetDefault("loglevel", "info")
 	viper.SetDefault("port", 4533)
-	viper.SetDefault("sessiontimeout", "1h")
-	viper.SetDefault("scaninterval", "1m")
+	viper.SetDefault("sessiontimeout", consts.DefaultSessionTimeout)
+	viper.SetDefault("scaninterval", time.Minute)
 	viper.SetDefault("baseurl", "")
 	viper.SetDefault("uiloginbackgroundurl", "")
 	viper.SetDefault("enabletranscodingconfig", false)
diff --git a/engine/auth/auth.go b/engine/auth/auth.go
index 774d33445..2bc42b285 100644
--- a/engine/auth/auth.go
+++ b/engine/auth/auth.go
@@ -44,11 +44,7 @@ func CreateToken(u *model.User) (string, error) {
 
 func getSessionTimeOut() time.Duration {
 	if sessionTimeOut == 0 {
-		if to, err := time.ParseDuration(conf.Server.SessionTimeout); err != nil {
-			sessionTimeOut = consts.DefaultSessionTimeout
-		} else {
-			sessionTimeOut = to
-		}
+		sessionTimeOut = conf.Server.SessionTimeout
 		log.Info("Setting Session Timeout", "value", sessionTimeOut)
 	}
 	return sessionTimeOut
diff --git a/server/server.go b/server/server.go
index 6b7e5f9c1..7e589bc4c 100644
--- a/server/server.go
+++ b/server/server.go
@@ -75,11 +75,7 @@ func (a *Server) initRoutes() {
 }
 
 func (a *Server) initScanner() {
-	interval, err := time.ParseDuration(conf.Server.ScanInterval)
-	if err != nil {
-		log.Error("Invalid interval specification. Using default of 5m", "interval", conf.Server.ScanInterval, err)
-		interval = 5 * time.Minute
-	}
+	interval := conf.Server.ScanInterval
 	if interval == 0 {
 		log.Warn("Scanner is disabled", "interval", conf.Server.ScanInterval)
 		return