From e6597d47e30db6cacb0877ef6f6da1d8e4a13f2c Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 20 Aug 2018 16:12:01 +0200
Subject: [PATCH] Fixes U4-11574 - return an empty string if the datatype is in
 "single" mode and nothing is selected

---
 .../FlexibleDropdownPropertyValueConverter.cs            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
index f9c1cd3cd7..ebacf15255 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
@@ -42,18 +42,19 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 return null;
             }
 
+            var isMultipleDataType = IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias);
+
             var selectedValues = (string[]) source;
+            
             if (selectedValues.Any())
             {
-                if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
-                {
+                if (isMultipleDataType)
                     return selectedValues;
-                }
 
                 return selectedValues.First();
             }
 
-            return source;
+            return isMultipleDataType ? source : string.Empty;
         }
 
         public Type GetPropertyValueType(PublishedPropertyType propertyType)