diff --git a/daemon/daemon.go b/daemon/daemon.go
index 428da80846858f0782460ee282465f70098d0e31..d0e2f8578e4ba52b8a051dcd287048814c5348fd 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -922,11 +922,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 		if err != nil {
 			return nil, err
 		}
-	}
 
-	// As layerstore initialization may set the driver
-	for os := range d.graphDrivers {
-		d.graphDrivers[os] = layerStores[os].DriverName()
+		// As layerstore initialization may set the driver
+		d.graphDrivers[operatingSystem] = layerStores[operatingSystem].DriverName()
 	}
 
 	// Configure and validate the kernels security support. Note this is a Linux/FreeBSD