diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt b/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt
index 8f78a827..5ef381bf 100644
--- a/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt
+++ b/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt
@@ -739,6 +739,10 @@ class ModerationCommands : Extension() {
 					}
 				}
 
+				arguments.userArgument.asMemberOrNull(guild!!.id)?.edit {
+					timeoutUntil = duration
+				}
+
 				respond {
 					content = "Timed-out ${arguments.userArgument.mention}."
 				}
@@ -784,6 +788,10 @@ class ModerationCommands : Extension() {
 					}
 				}
 
+				arguments.userArgument.asMemberOrNull(guild!!.id)?.edit {
+					timeoutUntil = null
+				}
+
 				respond {
 					content = "Removed timeout from user."
 				}