diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index caf58472cd..f5e2748360 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -156,9 +156,7 @@ function entityResource($q, $http, umbRequestHelper) {
                     umbRequestHelper.getApiUrl(
                         "entityApiBaseUrl",
                         "GetById",
-                        [{ id: id }, { type: type }]),
-                    //http configuration - in this case we don't want the interceptor to handle 404s
-                    { umbIgnoreStatus: [404] }),
+                        [{ id: id }, { type: type }])),
                 'Failed to retrieve entity data for id ' + id);
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index da20ec08e5..b0da5f562d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -77,13 +77,6 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
                         openMiniListView(node);
                     }
                     initTree();
-                },
-                function(response) {
-                    if (response.status === 404) {
-                        //doesn't exist anymore so reset
-                        dialogOptions.startNodeId = null;
-                        initTree();
-                    }
                 });
         }
         else {