diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index 7d80fc0a..6573edf7 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -53,11 +53,13 @@
           if (Array.isArray(shortcut)) {
             shortcut = shortcut[0];
           }
-          if (shortcut.charAt(0) == ':') {
-            shortcut = shortcut.substr(1, shortcut.length - 2);
-          }
-          if (code = shortcuts[shortcut]) {
-            result.push({code: code, rate: 1});
+          if (shortcut && typeof shortcut !== 'string') {
+            if (shortcut.charAt(0) == ':') {
+              shortcut = shortcut.substr(1, shortcut.length - 2);
+            }
+            if (code = shortcuts[shortcut]) {
+              result.push({code: code, rate: 1});
+            }
           }
         }
         callback(result);