diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index 0186f7f9..8164ab1a 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -161,14 +161,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			disname="";
 		}
 		//絵文字があれば
-		Object.keys(toot.user.emojis).forEach(function(key5) {
-			var emoji = toot.user.emojis[key5];
-			var shortcode = emoji.name;
-			var emoji_url = '<img draggable="false" src="' + emoji.url +
-				'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
-			var regExp = new RegExp(":" + shortcode + ":", "g");
-			dis_name = dis_name.replace(regExp, emoji_url);
-		});
+		if(toot.user.emojis){
+			Object.keys(toot.user.emojis).forEach(function(key5) {
+				var emoji = toot.user.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+			});
+		}
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js
index 40b7b86c..f8b1d195 100644
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -233,13 +233,13 @@ function notfCommon(acct_id, tlid, sys) {
 				var ipc = electron.ipcRenderer;
 				var os = electron.remote.process.platform;
 					var options = {
-						body: ct+lang.lang_notf_new[lang],
+						body: ct+lang.lang_notf_new,
 						icon: localStorage.getItem("prof_"+acct_id)
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
 					}
 				
 			}