diff --git a/client/src/components/Draftail/index.js b/client/src/components/Draftail/index.js
index 1a75ee8558..b536837e5d 100644
--- a/client/src/components/Draftail/index.js
+++ b/client/src/components/Draftail/index.js
@@ -16,7 +16,8 @@ import ModalWorkflowSource from './sources/ModalWorkflowSource';
 import registry from './registry';
 
 const wrapWagtailIcon = type => {
-  if (type.icon) {
+  const isIconFont = type.icon && typeof type.icon === 'string';
+  if (isIconFont) {
     return Object.assign(type, {
       icon: <Icon name={type.icon} />,
     });