diff --git a/main.go b/main.go
index 6a8b726cb..ee383b1e2 100644
--- a/main.go
+++ b/main.go
@@ -171,7 +171,9 @@ func setupLogger() {
 
 func main() {
 	printVersion := pflag.Bool("version", false, "Print version and exit")
+	validateConfig := pflag.Bool("check-config", false, "Validate configuration and exit")
 	pflag.Parse()
+
 	if *printVersion {
 		fmt.Println(version)
 		return
@@ -204,6 +206,11 @@ func main() {
 		log.Fatal("No valid Alertmanager URIs defined")
 	}
 
+	if *validateConfig {
+		log.Info("Configuration is valid")
+		return
+	}
+
 	// before we start try to fetch data from Alertmanager
 	log.Info("Initial Alertmanager query")
 	pullFromAlertmanager()