diff --git a/internal/app/wwctl/container/show/main.go b/internal/app/wwctl/container/show/main.go
index 749e1bb6..02701bab 100644
--- a/internal/app/wwctl/container/show/main.go
+++ b/internal/app/wwctl/container/show/main.go
@@ -24,8 +24,12 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
 	if !ShowAll {
 		fmt.Printf("%s\n", r.Rootfs)
 	} else {
+		kernelVersion := r.KernelVersion
+		if kernelVersion == "" {
+			kernelVersion = "not found"
+		}
 		fmt.Printf("Name: %s\n", r.Name)
-		fmt.Printf("KernelVersion: %s\n", r.KernelVersion)
+		fmt.Printf("KernelVersion: %s\n", kernelVersion)
 		fmt.Printf("Rootfs: %s\n", r.Rootfs)
 		fmt.Printf("Nr nodes: %d\n", len(r.Nodes))
 		fmt.Printf("Nodes: %s\n", r.Nodes)
diff --git a/internal/pkg/api/container/container.go b/internal/pkg/api/container/container.go
index ba31cc88..a76f7765 100644
--- a/internal/pkg/api/container/container.go
+++ b/internal/pkg/api/container/container.go
@@ -315,9 +315,6 @@ func ContainerShow(csp *wwapiv1.ContainerShowParameter) (response *wwapiv1.Conta
 	rootFsDir := container.RootFsDir(containerName)
 
 	kernelVersion := container.KernelVersion(containerName)
-	if kernelVersion == "" {
-		kernelVersion = "not found"
-	}
 
 	nodeDB, err := node.New()
 	if err != nil {