diff --git a/util/setPresence.js b/util/setPresence.js
index 785a330..a377ab9 100644
--- a/util/setPresence.js
+++ b/util/setPresence.js
@@ -4,8 +4,19 @@ module.exports = function ({presenceText, presenceType, client}) {
 	const {globalPrefix} = require ('../data/config.json')
 	let guildCount = getGuildCount(client)
 	let uptime = parseMS(client.uptime);
-	let uptimeSingularOrPlural = uptime.hours > 1 || uptime.minutes > 1 ? "s" : "";
-	let uptimeFormat = uptime.hours >= 1 || uptime.days >= 1 ? uptime.days * 24 + uptime.hours + ` hour${uptimeSingularOrPlural}`: uptime.minutes + ` minute${uptimeSingularOrPlural}`;
+
+	let uptimeFormat = "";
+	let uptimeSingularOrPlural;
+	if(uptime.hours >= 1 || uptime.days >= 1){
+		uptimeSingularOrPlural = uptime.hours > 1 ? "s" : "";
+		uptimeFormat = uptime.days * 24 + uptime.hours + ` hour${uptimeSingularOrPlural}`
+	}else if(uptime.minutes > 1){
+		uptimeSingularOrPlural = uptime.minutes > 1 ? "s" : "";
+		uptimeFormat = uptime.minutes + ` minute${uptimeSingularOrPlural}`;
+	}else{
+		uptimeFormat = `less than a minute`
+	}
+
 	let regex = [/\${guilds}/g,/\${prefix}/g,/\${uptime}/g];
 	let replaceValue = [guildCount, globalPrefix, uptimeFormat];
 	for(let i = 0; i < regex.length; i++){