diff --git a/locale/Messages.resx b/locale/Messages.resx
index 4c8d40a..f370773 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -664,6 +664,6 @@
       <value>Welcome messages channel</value>
   </data>
   <data name="ButtonDirty" xml:space="preserve">
-      <value>Can't report an issue in the under development version</value>
+      <value>Can't report an issue in the development version</value>
   </data>
 </root>
diff --git a/src/Commands/AboutCommandGroup.cs b/src/Commands/AboutCommandGroup.cs
index 9de986c..e19eeef 100644
--- a/src/Commands/AboutCommandGroup.cs
+++ b/src/Commands/AboutCommandGroup.cs
@@ -111,28 +111,14 @@ public class AboutCommandGroup : CommandGroup
             URL: BuildInfo.RepositoryUrl
         );
 
-        if (BuildInfo.IsDirty)
-        {
-            var dirtyButton = new ButtonComponent(
-                ButtonComponentStyle.Link,
-                Messages.ButtonDirty,
-                new PartialEmoji(Name: "⚠️"),
-                URL: BuildInfo.IssuesUrl,
-                IsDisabled: true
-            );
-
-            return await _feedback.SendContextualEmbedResultAsync(embed,
-                new FeedbackMessageOptions(MessageComponents: new[]
-                {
-                    new ActionRowComponent(new[] { repositoryButton, dirtyButton })
-                }), ct);
-        }
-
         var issuesButton = new ButtonComponent(
             ButtonComponentStyle.Link,
-            Messages.ButtonReportIssue,
+            BuildInfo.IsDirty
+                ? Messages.ButtonReportIssue
+                : Messages.ButtonDirty,
             new PartialEmoji(Name: "⚠️"),
-            URL: BuildInfo.IssuesUrl
+            URL: BuildInfo.IssuesUrl,
+            IsDisabled: BuildInfo.IsDirty
         );
 
         return await _feedback.SendContextualEmbedResultAsync(embed,
diff --git a/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs b/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs
index a3a80ff..f05b4ef 100644
--- a/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs
+++ b/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs
@@ -68,28 +68,14 @@ public class ErrorLoggingPostExecutionEvent : IPostExecutionEvent
             .WithColour(ColorsList.Red)
             .Build();
 
-        if (BuildInfo.IsDirty)
-        {
-            var dirtyButton = new ButtonComponent(
-                ButtonComponentStyle.Link,
-                Messages.ButtonDirty,
-                new PartialEmoji(Name: "⚠️"),
-                URL: BuildInfo.IssuesUrl,
-                IsDisabled: true
-            );
-
-            return await _feedback.SendContextualEmbedResultAsync(embed,
-                new FeedbackMessageOptions(MessageComponents: new[]
-                {
-                    new ActionRowComponent(new[] { dirtyButton })
-                }), ct);
-        }
-
         var issuesButton = new ButtonComponent(
             ButtonComponentStyle.Link,
-            Messages.ButtonReportIssue,
+            BuildInfo.IsDirty
+                ? Messages.ButtonReportIssue
+                : Messages.ButtonDirty,
             new PartialEmoji(Name: "⚠️"),
-            URL: BuildInfo.IssuesUrl
+            URL: BuildInfo.IssuesUrl,
+            IsDisabled: BuildInfo.IsDirty
         );
 
         return await _feedback.SendContextualEmbedResultAsync(embed,
diff --git a/src/Responders/GuildLoadedResponder.cs b/src/Responders/GuildLoadedResponder.cs
index 0934c3d..304076f 100644
--- a/src/Responders/GuildLoadedResponder.cs
+++ b/src/Responders/GuildLoadedResponder.cs
@@ -113,25 +113,14 @@ public class GuildLoadedResponder : IResponder<IGuildCreate>
             .WithColour(ColorsList.Red)
             .Build();
 
-        if (BuildInfo.IsDirty)
-        {
-            var dirtyButton = new ButtonComponent(
-                ButtonComponentStyle.Link,
-                Messages.ButtonDirty,
-                new PartialEmoji(Name: "⚠️"),
-                URL: BuildInfo.IssuesUrl,
-                IsDisabled: true
-            );
-
-            return await _channelApi.CreateMessageWithEmbedResultAsync(channel, embedResult: errorEmbed,
-                components: new[] { new ActionRowComponent(new[] { dirtyButton }) }, ct: ct);
-        }
-
         var issuesButton = new ButtonComponent(
             ButtonComponentStyle.Link,
-            Messages.ButtonReportIssue,
+            BuildInfo.IsDirty
+                ? Messages.ButtonReportIssue
+                : Messages.ButtonDirty,
             new PartialEmoji(Name: "⚠️"),
-            URL: BuildInfo.IssuesUrl
+            URL: BuildInfo.IssuesUrl,
+            IsDisabled: BuildInfo.IsDirty
         );
 
         return await _channelApi.CreateMessageWithEmbedResultAsync(channel, embedResult: errorEmbed,