diff --git a/ChangeLog b/ChangeLog
index 23314e955..23d39cfd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Bug fixes:
 - #7012 Fix natural horizontal scrolling on Mac client
 - #6997 Allow Windows to go to sleep depending on system preferences
 - #7001 Add option to prevent computer from going to sleep
-- #7029 Wrong encoding for text copied between linux and windows
+- #7029 | #7033 Wrong encoding for text copied between linux and windows
 - #7015 Fix Windows service not starting up after sleep
 
 Enhancements:
diff --git a/src/lib/platform/OSXClipboardHTMLConverter.cpp b/src/lib/platform/OSXClipboardHTMLConverter.cpp
index 03caaa09b..462bb93fd 100644
--- a/src/lib/platform/OSXClipboardHTMLConverter.cpp
+++ b/src/lib/platform/OSXClipboardHTMLConverter.cpp
@@ -83,13 +83,18 @@ OSXClipboardHTMLConverter::convertString(
 String
 OSXClipboardHTMLConverter::doFromIClipboard(const String& data) const
 {
-    return convertString(data, kCFStringEncodingUTF8,
-                CFStringGetSystemEncoding());
+    return data;
 }
 
 String
 OSXClipboardHTMLConverter::doToIClipboard(const String& data) const
 {
-    return convertString(data, CFStringGetSystemEncoding(),
-                kCFStringEncodingUTF8);
+    if (Unicode::isUTF8(data))
+    {
+        return data;
+    }
+    else
+    {
+        return convertString(data, CFStringGetSystemEncoding(), kCFStringEncodingUTF8);
+    }
 }