diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 8b8689c6d887..81fd8632c36d 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -2129,6 +2129,10 @@ static int xennet_remove(struct xenbus_device *dev)
        struct netfront_info *info = dev_get_drvdata(&dev->dev);

        dev_dbg(&dev->dev, "%s\n", dev->nodename);
+       xenbus_switch_state(dev, XenbusStateClosing);
+       while (xenbus_read_driver_state(dev->otherend) != XenbusStateClosing);
+       xenbus_switch_state(dev, XenbusStateClosed);
+       while (dev->xenbus_state != XenbusStateClosed);

        xennet_disconnect_backend(info);