Fix START_WATCHING bug for empty workspaces