diff --git a/commands/userinfo.js b/commands/userinfo.js
index d673cf8..92e6f6c 100644
--- a/commands/userinfo.js
+++ b/commands/userinfo.js
@@ -26,15 +26,21 @@ module.exports = {
 		if (user.roles.color) {
 			roleColor = user.roles.color.color;
 		}
-
-		let presenceDetails = morePresence(user);
+		let presenceDetails = 0;
+		let isPresence = false;
+		
+		if(user.user.presence.activities.length != 0){
+			presenceDetails = morePresence(user);
+			isPresence = true;
+		}
 		const embed = new Discord.MessageEmbed()
 			.setThumbnail(user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
 			.setColor(roleColor)
 			.setTimestamp()
 			.setAuthor(user.user.username, user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
 			.addField("Username", `**${user.user.username}#${user.user.discriminator}**${nickname}`)
-			.addField("Presence", user.user.presence.activities[0].name, false)
+			if(isPresence)
+				embed.addField("Presence", user.user.presence.activities[0].name, false)
 			if(presenceDetails != 0)
 				embed.addField("Details", presenceDetails, false)
 			embed.addField("Joined", getJoinDate(user, message.guild), true)
diff --git a/util/morePresence.js b/util/morePresence.js
index 845402b..8d9aaa3 100644
--- a/util/morePresence.js
+++ b/util/morePresence.js
@@ -14,7 +14,10 @@ module.exports = function (user) {
 			details = `"${user.user.presence.activities[0].state}"\n`
 			break;
 		case "Code":
-			details = `Workspace: ${user.user.presence.activities[0].state}\nEditing: ${user.user.presence.activities[0].details.slice(8)}\n`
+			if(user.user.presence.activities[0].details.slice(0, 7) === "Editing")
+				details = `Workspace: ${user.user.presence.activities[0].state}\nEditing: ${user.user.presence.activities[0].details.slice(8)}\n`
+			else 
+				details = `Workspace: ${user.user.presence.activities[0].state}\n${user.user.presence.activities[0].details}\n`
 			break;
 		default:
 			details = 0;