diff --git a/Linphone/Core/CorePreferences.swift b/Linphone/Core/CorePreferences.swift
index fc567e51e..1f1e4ca6d 100644
--- a/Linphone/Core/CorePreferences.swift
+++ b/Linphone/Core/CorePreferences.swift
@@ -291,8 +291,8 @@ class CorePreferences {
 	
 	private static func safeString(_ raw: String?, defaultValue: String = "") -> String {
 		guard let raw = raw else { return defaultValue }
-		if let data = raw.data(using: .utf8), let s = String(data: data, encoding: .utf8) {
-			return s
+		if let data = raw.data(using: .utf8) {
+			return String(decoding: data, as: UTF8.self)
 		}
 		return defaultValue
 	}