diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3a39fb64..c89f128a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 
 ## Unreleased
 
+### Changed
 
+- Ban `.warnp` will now prune user's messages
+
+### Fixed
+
+- `.boostmsg` will now properly show boost, and not greet message
 
 ## [3.0.2] - 12.09.2021
 
diff --git a/src/NadekoBot/Modules/Administration/ServerGreetCommands.cs b/src/NadekoBot/Modules/Administration/ServerGreetCommands.cs
index 7aaa163d7..173ca4e85 100644
--- a/src/NadekoBot/Modules/Administration/ServerGreetCommands.cs
+++ b/src/NadekoBot/Modules/Administration/ServerGreetCommands.cs
@@ -41,6 +41,15 @@ namespace NadekoBot.Modules.Administration
                     await ReplyPendingLocalizedAsync(strs.boostdel_off).ConfigureAwait(false);
             }
 
+            [NadekoCommand, Aliases]
+            [RequireContext(ContextType.Guild)]
+            [UserPerm(GuildPerm.ManageGuild)]
+            public Task BoostMsg()
+            {
+                var boostMessage = _service.GetBoostMessage(ctx.Guild.Id);
+                return ReplyConfirmLocalizedAsync(strs.boostmsg_cur(boostMessage?.SanitizeMentions()));
+            }
+
             [NadekoCommand, Aliases]
             [RequireContext(ContextType.Guild)]
             [UserPerm(GuildPerm.ManageGuild)]
@@ -48,7 +57,7 @@ namespace NadekoBot.Modules.Administration
             {
                 if (string.IsNullOrWhiteSpace(text))
                 {
-                    await GreetMsg().ConfigureAwait(false);
+                    await BoostMsg().ConfigureAwait(false);
                     return;
                 }
 
diff --git a/src/NadekoBot/Services/GreetSettingsService.cs b/src/NadekoBot/Services/GreetSettingsService.cs
index 5fc5afa0e..6cd363dbe 100644
--- a/src/NadekoBot/Services/GreetSettingsService.cs
+++ b/src/NadekoBot/Services/GreetSettingsService.cs
@@ -172,6 +172,12 @@ namespace NadekoBot.Services
                 return uow.GuildConfigsForId(gid, set => set).ChannelGreetMessageText;
             }
         }
+        
+        public string GetBoostMessage(ulong gid)
+        {
+            using var uow = _db.GetDbContext();
+            return uow.GuildConfigsForId(gid, set => set).BoostMessage;
+        }
 
         private Task ByeUsers(GreetSettings conf, ITextChannel channel, IUser user)
             => ByeUsers(conf, channel, new[] {user});