diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index afd6692d7d40..c4549b6cc121 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -42,7 +42,7 @@ Onyx.connect({
     callback: (val) => {
         // the preferred skin tone is sometimes still "default", although it
         // was changed that "default" has become -1.
-        if (Number.isInteger(Number(val))) {
+        if (!_.isNull(val) && Number.isInteger(Number(val))) {
             preferredSkinTone = val;
         } else {
             preferredSkinTone = -1;
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index ddf803050dd3..cab49dcc3c9c 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -40,7 +40,7 @@ const CONTEXT_MENU_TYPES = {
 export default [
     {
         shouldKeepOpen: true,
-        shouldShow: (type, reportAction) => reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU,
+        shouldShow: (type, reportAction) => type === CONTEXT_MENU_TYPES.REPORT_ACTION && _.has(reportAction, 'message') && reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU,
         renderContent: (closePopover, {
             reportID, reportAction, close: closeManually, openContextMenu,
         }) => {