diff --git a/config/config.go b/config/config.go
index d79dd83..7f28d8f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -568,6 +568,10 @@ func (sc *SystemConfiguration) GetStatesPath() string {
 //
 // This function IS NOT thread-safe.
 func ConfigureTimezone() error {
+	tz := os.Getenv("TZ")
+	if _config.System.Timezone == "" && tz != "" {
+		_config.System.Timezone = tz
+	}
 	if _config.System.Timezone == "" {
 		b, err := ioutil.ReadFile("/etc/timezone")
 		if err != nil {