diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index dd41a439a3..a1e48bbc99 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -20,7 +20,9 @@ angular.module("umbraco")
                         $scope.model.value = [];
                     }
                     else {
-                        $scope.model.value = $scope.model.value.split(",");
+                       if($scope.model.value.length > 0) {
+                          $scope.model.value = $scope.model.value.split(",");
+                       }
                     }
                 }
             }
@@ -188,4 +190,4 @@ angular.module("umbraco")
         });
 
     }
-);
\ No newline at end of file
+);
\ No newline at end of file