diff --git a/commands/admin/setPresence.js b/commands/admin/setPresence.js
index c47b8d9..d7772e3 100644
--- a/commands/admin/setPresence.js
+++ b/commands/admin/setPresence.js
@@ -1,5 +1,4 @@
 const savePresence = require("../../util/savePresence");
-const timeUntil = require("../../util/timer/timeUntil");
 
 module.exports = {
 	name: 'setpresence', 
@@ -15,7 +14,7 @@ module.exports = {
 	admin: true,
 	execute({message, client, args}) { 
 		let presenceType = args[0].toLocaleUpperCase();
-		let sendText = "Presence has been set.";
+		let sendText = "Presence has been set. It can take up to a minute for it to update.";
 		
 		switch (presenceType) {
 			case "PLAY":
@@ -47,7 +46,6 @@ module.exports = {
 			let temp = args.join(" ");
 			let presenceText = temp.slice(firstArg, temp.length)
 			savePresence(presenceType, presenceText, client);
-			sendText = `${sendText} It will update in ${timeUntil(client.lastPresenceUpdate + 60000).totalInSeconds} seconds`
 		}
 		message.channel.send(sendText);
 	
diff --git a/server/ready.js b/server/ready.js
index b1c9fa6..f559617 100644
--- a/server/ready.js
+++ b/server/ready.js
@@ -4,12 +4,8 @@ const updatePresence = require('../util/updatePresence');
 
 module.exports = function(client, enableLoginMessage, loginChannel, loginMessage) {
 	
-	updatePresence(client)
-	client.lastPresenceUpdate = Date.now()
-
 	setInterval(() => {
 		updatePresence(client)
-		client.lastPresenceUpdate = Date.now()
 	}, 60 * 1000);
 	
 	console.log('Ready!');
diff --git a/util/updatePresence.js b/util/updatePresence.js
index e293ac4..ca4e4e6 100644
--- a/util/updatePresence.js
+++ b/util/updatePresence.js
@@ -4,5 +4,7 @@ module.exports = function (client) {
 	let presenceText = client.settings.get("presenceText")
 	let presenceType = client.settings.get("presenceType")
 
-	setPresence({presenceText: presenceText, presenceType: presenceType, client: client});	
+	if(presenceText.includes("${guilds}") || presenceText.includes("${prefix}") || presenceText.includes("${uptime}")) {
+		setPresence({presenceText: presenceText, presenceType: presenceType, client: client});	
+	}
 }