diff --git a/src/Umbraco.Core/Models/TagCacheStorageType.cs b/src/Umbraco.Core/Models/TagCacheStorageType.cs
index 5078a44d85..5b7be84fb8 100644
--- a/src/Umbraco.Core/Models/TagCacheStorageType.cs
+++ b/src/Umbraco.Core/Models/TagCacheStorageType.cs
@@ -2,7 +2,7 @@
 {
     public enum TagCacheStorageType
     {
-        Csv,
-        Json
+        Json,
+        Csv
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs b/src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
index 3ff124d345..c0238e16e8 100644
--- a/src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
+++ b/src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.PropertyEditors
             Delimiter = ",";
             ReplaceTags = true;
             TagGroup = "default";
-            StorageType = TagCacheStorageType.Csv;
+            StorageType = TagCacheStorageType.Json;
         }
 
         /// <summary>
@@ -59,4 +59,4 @@ namespace Umbraco.Core.PropertyEditors
         /// </summary>
         public string TagGroup { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html
index 2eb9aecf1e..d1113c41a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.prevalues.html
@@ -3,8 +3,8 @@
     <select name="dropDownList"
             class="umb-editor umb-dropdown"
             ng-model="model.value">
-        <option>Csv</option>
         <option>Json</option>
+        <option>Csv</option>
     </select>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index 1faa6ed0ab..a843384fe4 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.PropertyEditors
             _defaultPreVals = new Dictionary<string, object>
                 {
                     {"group", "default"},
-                    {"storageType", TagCacheStorageType.Csv.ToString()}
+                    {"storageType", TagCacheStorageType.Json.ToString()}
                 };
         }
 
@@ -133,7 +133,7 @@ namespace Umbraco.Web.PropertyEditors
 
                 Fields.Add(new PreValueField(new ManifestPropertyValidator {Type = "Required"})
                 {
-                    Description = "Select whether to store the tags in cache as CSV (default) or as JSON. The only benefits of storage as JSON is that you are able to have commas in a tag value",
+                    Description = "Select whether to store the tags in cache as JSON (default) or as CSV (Legacy).",
                     Key = "storageType",
                     Name = "Storage Type",
                     View = "views/propertyeditors/tags/tags.prevalues.html"