diff --git a/pkg/config/config.go b/pkg/config/config.go
index 3c5928c1f..a0d54b0c8 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -29,6 +29,7 @@ import (
 	_ "time/tzdata" // Imports time zone data instead of relying on the os
 
 	"code.vikunja.io/api/pkg/log"
+
 	"github.com/spf13/viper"
 )
 
@@ -458,6 +459,40 @@ func readConfigValuesFromFiles() {
 	}
 }
 
+func setConfigFromEnv() error {
+	envKeys := os.Environ()
+	configMap := make(map[string]any)
+	for _, envKeyValue := range envKeys {
+		keyValue := strings.SplitN(envKeyValue, "=", 2)
+		if len(keyValue) != 2 {
+			continue
+		}
+		key, value := keyValue[0], keyValue[1]
+
+		if strings.HasPrefix(key, "VIKUNJA_") {
+			formattedKey := strings.ToLower(strings.TrimPrefix(key, "VIKUNJA_"))
+			keys := strings.Split(formattedKey, "_")
+			currentMap := configMap
+
+			for i, part := range keys {
+				if i == len(keys)-1 {
+					// Set the value at the final level
+					currentMap[part] = value
+				} else {
+					// Check if the key exists at the current level, create a new map if not
+					if _, exists := currentMap[part]; !exists {
+						currentMap[part] = make(map[string]any)
+					}
+
+					// Move into the nested map
+					currentMap = currentMap[part].(map[string]any)
+				}
+			}
+		}
+	}
+	return viper.MergeConfigMap(configMap)
+}
+
 // InitConfig initializes the config, sets defaults etc.
 func InitConfig() {
 
@@ -469,8 +504,6 @@ func InitConfig() {
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
 
-	// Just load environment variables
-	_ = viper.ReadInConfig()
 	log.ConfigureLogger(LogEnabled.GetBool(), LogStandard.GetString(), LogPath.GetString(), LogLevel.GetString())
 
 	// Load the config file
@@ -502,6 +535,11 @@ func InitConfig() {
 		log.Info("No config file found, using default or config from environment variables.")
 	}
 
+	err = setConfigFromEnv()
+	if err != nil {
+		log.Warningf("Failed to set config from environment variables: %s", err.Error())
+	}
+
 	readConfigValuesFromFiles()
 
 	if RateLimitStore.GetString() == "keyvalue" {