diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
index dafcf5dd8..b67df768d 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
@@ -380,7 +380,11 @@ namespace Orchard.Lists.Controllers {
         [HttpPost, ActionName("List")]
         [FormValueRequired("listViewName")]
         public ActionResult ChangeListView(int containerId, string listViewName, PagerParameters pagerParameters) {
-            var container = _containerService.Get(containerId);
+            var container = _containerService.Get(containerId, VersionOptions.Latest);
+            if (container == null || !container.Has<ContainerPart>()) {
+                return HttpNotFound();
+            }
+
             container.Record.AdminListViewName = listViewName;
             return RedirectToAction("List", new { containerId, page = pagerParameters.Page, pageSize = pagerParameters.PageSize });
         }