diff --git a/res/css/views/emojipicker/_EmojiPicker.pcss b/res/css/views/emojipicker/_EmojiPicker.pcss
index 6872ae873e..cd7b2bb769 100644
--- a/res/css/views/emojipicker/_EmojiPicker.pcss
+++ b/res/css/views/emojipicker/_EmojiPicker.pcss
@@ -109,6 +109,10 @@ Please see LICENSE files in the repository root for full details.
         border: none;
         padding: 8px 12px;
         border-radius: 4px 0;
+
+        &::placeholder {
+            color: var(--cpd-color-text-placeholder);
+        }
     }
 
     button {
diff --git a/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss b/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
index 81c1e3bfe1..dfe05afa3e 100644
--- a/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
+++ b/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
@@ -155,7 +155,7 @@ Please see LICENSE files in the repository root for full details.
         display: inline-block;
         pointer-events: none;
         white-space: nowrap;
-        color: $tertiary-content;
+        color: var(--cpd-color-text-placeholder);
     }
 }