diff --git a/config/config_system.go b/config/config_system.go
index 2877197..b84d00b 100644
--- a/config/config_system.go
+++ b/config/config_system.go
@@ -211,12 +211,14 @@ func (sc *SystemConfiguration) ConfigureTimezone() error {
 				return nil
 			}
 
-			sc.Timezone = regexp.MustCompile(`\s+$`).ReplaceAllString(string(matches[1]), "")
+			sc.Timezone = string(matches[1])
 		} else {
 			sc.Timezone = string(b)
 		}
 	}
 
+	sc.Timezone = regexp.MustCompile(`[^a-z_/]+/i`).ReplaceAllString(sc.Timezone, "")
+
 	_, err := time.LoadLocation(sc.Timezone)
 
 	return errors.Wrap(err, fmt.Sprintf("the supplied timezone %s is invalid", sc.Timezone))