diff --git a/internal/websocket/client_commands.go b/internal/websocket/client_commands.go
index 60158f2..2fba584 100644
--- a/internal/websocket/client_commands.go
+++ b/internal/websocket/client_commands.go
@@ -9,6 +9,10 @@ import (
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
+func checkSettings(settings models.PomodoroConfig) bool {
+	return settings.Work > 0 && settings.ShortBreak > 0 && settings.LongBreak > 0 && settings.Sessions > 0
+}
+
 // Listens for commands from a client and handles them
 func handleClientCommands(c models.WebsocketClient) {
 	ws := c.Conn
@@ -50,6 +54,11 @@ func handleClientCommands(c models.WebsocketClient) {
 				}
 			case "updateSettings":
 				if !pomodoro.IsPomodoroOngoing() {
+					if !checkSettings(clientCommand.Settings) {
+						log.Warn("Ignoring invalid config:", "msg", clientCommand.Settings, "host", c.Conn.RemoteAddr())
+						break
+					}
+					log.Info("Client send config", "config", clientCommand.Settings, "host", c.Conn.RemoteAddr())
 					pomodoro.UpdateSettings(clientCommand.Settings)
 				}
 			}
diff --git a/pkg/models/config.go b/pkg/models/config.go
index 36b9dbb..1852165 100644
--- a/pkg/models/config.go
+++ b/pkg/models/config.go
@@ -1,5 +1,7 @@
 package models
 
+import "fmt"
+
 // Represents the configuration of a pomodoro
 type PomodoroConfig struct {
 	Work       int `json:"work"`       // Length of work sessions in seconds
@@ -8,6 +10,11 @@ type PomodoroConfig struct {
 	Sessions   int `json:"sessions"`   // Number of total sessions
 }
 
+// Stringer interface for the PomodocoConfig model
+func (c PomodoroConfig) String() string {
+	return fmt.Sprintf("{work: %d, short: %d, long: %d, sessions: %d}", c.Work, c.ShortBreak, c.LongBreak, c.Sessions)
+}
+
 // Represents the server configuration
 type ServerConfig struct {
 	ListenAddress string `json:"listenAddress"` // Server listen address