diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 828763bc1c..f9c8ae8b0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -19,15 +19,16 @@ angular.module('umbraco')
             };
         }
 
-		if($scope.model.value.id && $scope.model.value.type !== "member"){
-			entityResource.getById($scope.model.value.id, entityType()).then(function(item){
+        if($scope.model.value.id && $scope.model.value.type !== "member"){
+            entityResource.getById($scope.model.value.id, entityType()).then(function(item){
                 populate(item);
-			});
+            });
+        }
+        else {
+            $timeout(function () {
+                treeSourceChanged();
+            }, 100);
         }
-
-	    $timeout(function () {
-	        treeSourceChanged();
-	    }, 100);
 
         function entityType() {
 			var ent = "Document";
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
index ef781c6014..a87377c84b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
@@ -7,7 +7,6 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
 
     var allItemTypes = null;
     var currentItemType = null;
-    var initialLoad = true;
 
     function init() {
         vm.loading = true;
@@ -86,13 +85,12 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
     }
 
     eventsService.on("treeSourceChanged", function (e, args) {
-        currentItemType = args.value;
         // reset the model value if we changed node type (but not on the initial load)
-        if (!initialLoad) {
+        if (!!currentItemType && currentItemType !== args.value) {
             vm.itemTypes = [];
             updateModel();
         }
-        initialLoad = false;
+        currentItemType = args.value;
         init();
     });
 }