diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88eac3ce..57a32099 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Minor: Add information about the user's operating system in the About page. (#3663)
 - Minor: Added chatter count for each category in viewer list. (#3683, #3719)
 - Minor: Sorted usernames in /vips message to be case-insensitive. (#3696)
+- Minor: Strip leading @ and trailing , from usernames in the `/block` and `/unblock` commands. (#3816)
 - Minor: Added option to open a user's chat in a new tab from the usercard profile picture context menu. (#3625)
 - Minor: Fixed tag parsing for consecutive escaped characters. (#3711)
 - Minor: Prevent user from entering incorrect characters in Live Notifications channels list. (#3715, #3730)
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 7aa82c7d..1dd90b44 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -334,6 +334,7 @@ void CommandController::initialize(Settings &, Paths &paths)
         }
 
         auto target = words.at(1);
+        stripChannelName(target);
 
         getHelix()->getUserByName(
             target,
@@ -379,6 +380,7 @@ void CommandController::initialize(Settings &, Paths &paths)
         }
 
         auto target = words.at(1);
+        stripChannelName(target);
 
         getHelix()->getUserByName(
             target,