diff --git a/daemon/daemon.go b/daemon/daemon.go
index e59be1edd5b5a..e1c2e50f0f2bc 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -204,6 +204,11 @@ func (daemon *Daemon) RegistryHosts() docker.RegistryHosts {
 }
 
 func (daemon *Daemon) restore(ctx context.Context) error {
+	// Restoring containers after a restart is not yet supported
+	// when using the containerd content store.
+	if daemon.UsesSnapshotter() {
+		return nil
+	}
 	var mapLock sync.Mutex
 	containers := make(map[string]*container.Container)