diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 387dd71da8..9e2a64239f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -188,8 +188,17 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
                     //used advanced filtering
                     if ($scope.model.filter.startsWith("{")) {
                         $scope.model.filterAdvanced = true;
-                        //convert to object
-                        $scope.model.filter = Utilities.fromJson($scope.model.filter);
+
+                        if ($scope.model.filterByMetadata && !angular.isFunction($scope.model.filter))
+                        {
+                            var filter = angular.fromJson($scope.model.filter);
+                            $scope.model.filter = function (node){ return _.isMatch(node.metaData, filter);};
+                        }            
+                        else
+                        {
+                            //convert to object
+                            $scope.model.filter = Utilities.fromJson($scope.model.filter);
+                        }
                     }
                 }
             }