diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index a5b1eff3e1d..69b7b80dbf4 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -153,12 +153,12 @@ $note-form-margin-left: 72px;
     position: relative;
 
     .timeline-discussion-body {
-      margin-top: -8px;
+      margin-top: -$gl-padding-8;
       overflow-x: auto;
       overflow-y: hidden;
 
-      .discussion-resolved-text {
-        margin-bottom: 8px;
+      .note-body {
+        margin-top: $gl-padding-8;
       }
     }
 
diff --git a/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml b/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml
new file mode 100644
index 00000000000..765398cda84
--- /dev/null
+++ b/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml
@@ -0,0 +1,5 @@
+---
+title: Fix spacing on discussions
+merge_request: !24197
+author:
+type: fixed