diff --git a/log/main.go b/log/main.go
index 9034945da62854c232c5b44fd04f8b0caaddc25b..40734a2917d60d1bdb0ff7e8408a44ddc2db6fe4 100644
--- a/log/main.go
+++ b/log/main.go
@@ -10,15 +10,21 @@ import (
 var Log = logrus.New()
 
 func Init() {
-	Log.SetOutput(os.Stdout)
-	Log.AddHook(&LumberjackHook{
-		Logger: &lumberjack.Logger{
-			Filename:   os.Getenv("LOG_FOLDER") + "/application.log",
-			MaxSize:    10,   // Max size in MB
-			MaxBackups: 3,    // Max number of old log files to keep
-			MaxAge:     28,   // Max age in days to keep a log file
-			Compress:   true, // Compress old log files
-		}})
+	if os.Getenv("LOG_FOLDER") != "" {
+		Log.Info("Initializing file logger")
+		Log.SetOutput(os.Stdout)
+		Log.AddHook(&LumberjackHook{
+			Logger: &lumberjack.Logger{
+				Filename:   os.Getenv("LOG_FOLDER") + "/application.log",
+				MaxSize:    10,   // Max size in MB
+				MaxBackups: 3,    // Max number of old log files to keep
+				MaxAge:     28,   // Max age in days to keep a log file
+				Compress:   true, // Compress old log files
+			}})
+		Log.SetFormatter(&logrus.TextFormatter{
+			FullTimestamp: true,
+		})
+	}
 
 	if os.Getenv("LOG_LEVEL") == "" {
 		Log.SetLevel(logrus.InfoLevel)
@@ -34,8 +40,5 @@ func Init() {
 			Log.SetLevel(logrus.DebugLevel)
 		}
 	}
-	Log.SetFormatter(&logrus.TextFormatter{
-		FullTimestamp: true,
-	})
 	Log.Infof("Logger initialized with %s log level", Log.Level)
 }