diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 6e950dea84..8961071c33 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -486,7 +486,7 @@ $left-gutter: 64px;
 
     pre, code {
         font-family: $monospace-font-family !important;
-        background-color: $header-panel-bg-color;
+        background-color: $codeblock-background-color;
     }
 
     pre code > * {
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index ca06d38b1f..cad884e8b2 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -209,6 +209,8 @@ $appearance-tab-border-color: $room-highlight-color;
 
 $composer-shadow-color: rgba(0, 0, 0, 0.28);
 
+$codeblock-background-color: #2a3039;
+
 // Bubble tiles
 $eventbubble-self-bg: #14322E;
 $eventbubble-others-bg: $event-selected-color;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 0fe9f22dde..5fa0e903ba 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -221,6 +221,8 @@ $appearance-tab-border-color: $room-highlight-color;
 
 $composer-shadow-color: tranparent;
 
+$codeblock-background-color: #2a3039;
+
 // Bubble tiles
 $eventbubble-self-bg: #14322E;
 $eventbubble-others-bg: $event-selected-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 09dd46d151..7fe5649787 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -334,6 +334,8 @@ $appearance-tab-border-color: $input-darker-bg-color;
 
 $composer-shadow-color: tranparent;
 
+$codeblock-background-color: $header-panel-bg-color;
+
 // Bubble tiles
 $eventbubble-self-bg: #F0FBF8;
 $eventbubble-others-bg: $system;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 1733831b95..0f8583ecf7 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -333,6 +333,8 @@ $appearance-tab-border-color: $input-darker-bg-color;
 }
 $composer-shadow-color: rgba(0, 0, 0, 0.04);
 
+$codeblock-background-color: $header-panel-bg-color;
+
 // Bubble tiles
 $eventbubble-self-bg: #F0FBF8;
 $eventbubble-others-bg: $system;