diff --git a/utils/config.go b/utils/config.go
index 23bd3e85af..6a7e4589c6 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -221,6 +221,10 @@ func LoadConfig(fileName string) {
 	// Grabs the domain from enviroment variable if not in configuration
 	if config.ServiceSettings.Domain == "" {
 		config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
+		// If the enviroment variable is not set, use a default
+		if config.ServiceSettings.Domain == "" {
+			config.ServiceSettings.Domain = "localhost"
+		}
 	}
 
 	// Check for a valid email for feedback, if not then do feedback@domain