diff --git a/accounts/pkg/config/parser/parse.go b/accounts/pkg/config/parser/parse.go
index 92cba79b5f..fb801aed28 100644
--- a/accounts/pkg/config/parser/parse.go
+++ b/accounts/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/glauth/pkg/config/parser/parse.go b/glauth/pkg/config/parser/parse.go
index 540bf80d3e..de91a18232 100644
--- a/glauth/pkg/config/parser/parse.go
+++ b/glauth/pkg/config/parser/parse.go
@@ -24,7 +24,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -35,7 +35,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/graph-explorer/pkg/config/parser/parse.go b/graph-explorer/pkg/config/parser/parse.go
index cb463eecf8..c9127c292f 100644
--- a/graph-explorer/pkg/config/parser/parse.go
+++ b/graph-explorer/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/graph/pkg/config/parser/parse.go b/graph/pkg/config/parser/parse.go
index bfb1302bbf..367089f852 100644
--- a/graph/pkg/config/parser/parse.go
+++ b/graph/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/idp/pkg/config/parser/parse.go b/idp/pkg/config/parser/parse.go
index faa1ea1665..d5561337e5 100644
--- a/idp/pkg/config/parser/parse.go
+++ b/idp/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/ocis-pkg/config/parser/parse.go b/ocis-pkg/config/parser/parse.go
index a0870d17c7..ba75a411c0 100644
--- a/ocis-pkg/config/parser/parse.go
+++ b/ocis-pkg/config/parser/parse.go
@@ -23,7 +23,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &shared.Log{}
 	}
 
diff --git a/ocs/pkg/config/parser/parse.go b/ocs/pkg/config/parser/parse.go
index 48f8e51a2d..96f4205dfc 100644
--- a/ocs/pkg/config/parser/parse.go
+++ b/ocs/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/proxy/pkg/config/parser/parse.go b/proxy/pkg/config/parser/parse.go
index 493ed0bca6..55105cfcbc 100644
--- a/proxy/pkg/config/parser/parse.go
+++ b/proxy/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/settings/pkg/config/parser/parse.go b/settings/pkg/config/parser/parse.go
index 5ceb37a1ff..f1c7c94362 100644
--- a/settings/pkg/config/parser/parse.go
+++ b/settings/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 0de42d2b91..b3a3cf4828 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -423,7 +423,7 @@ func ParseConfig(c *cli.Context, cfg *config.Config, storageExtension string) er
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &shared.Log{}
 	}
 
diff --git a/store/pkg/config/parser/parse.go b/store/pkg/config/parser/parse.go
index 29e2efa292..a0f532c9e1 100644
--- a/store/pkg/config/parser/parse.go
+++ b/store/pkg/config/parser/parse.go
@@ -24,7 +24,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -35,7 +35,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/thumbnails/pkg/config/parser/parse.go b/thumbnails/pkg/config/parser/parse.go
index e621f53d07..5fa62fb15e 100644
--- a/thumbnails/pkg/config/parser/parse.go
+++ b/thumbnails/pkg/config/parser/parse.go
@@ -24,7 +24,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -35,7 +35,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/web/pkg/config/parser/parse.go b/web/pkg/config/parser/parse.go
index 766c4d6e81..2151f613e4 100644
--- a/web/pkg/config/parser/parse.go
+++ b/web/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
 
diff --git a/webdav/pkg/config/parser/parse.go b/webdav/pkg/config/parser/parse.go
index e6e0246aff..33c893db4a 100644
--- a/webdav/pkg/config/parser/parse.go
+++ b/webdav/pkg/config/parser/parse.go
@@ -25,7 +25,7 @@ func ParseConfig(cfg *config.Config) error {
 			Color:  cfg.Commons.Log.Color,
 			File:   cfg.Commons.Log.File,
 		}
-	} else if cfg.Log == nil && cfg.Commons == nil {
+	} else if cfg.Log == nil {
 		cfg.Log = &config.Log{}
 	}
 	// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
@@ -36,7 +36,7 @@ func ParseConfig(cfg *config.Config) error {
 			Endpoint:  cfg.Commons.Tracing.Endpoint,
 			Collector: cfg.Commons.Tracing.Collector,
 		}
-	} else if cfg.Tracing == nil && cfg.Commons == nil {
+	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}