diff --git a/command/agent/command.go b/command/agent/command.go
index b80c0df05..a8d1ef045 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -111,6 +111,11 @@ func (c *Command) readConfig() *Config {
 		c.Ui.Error("WARNING: Bootstrap mode enabled! Do not enable unless necessary")
 	}
 
+	// Warn if using windows as a server
+	if config.Server && runtime.GOOS == "windows" {
+		c.Ui.Error("WARNING: Windows is not recommended as a Consul server. Do not use in production.")
+	}
+
 	return config
 }