diff --git a/src/modules/general.js b/src/modules/general.js
index c1b149e..0095621 100644
--- a/src/modules/general.js
+++ b/src/modules/general.js
@@ -125,7 +125,9 @@ ping.description = "Measures response times to Discord.";
 ping.addAlias("p");
 ping.callback = async function (msg) {
   const newMsg = await msg.channel.createMessage("Pong.");
-  const rtt = Math.floor(newMsg.timestamp - msg.timestamp);
+  const rtt = Math.floor(
+    newMsg.timestamp - (msg.editedTimestamp || msg.timestamp)
+  );
   const gateway = hf.bot.shards.get(
     hf.bot.guildShardMap[hf.bot.channelGuildMap[msg.channel.id]] || 0
   ).latency;