diff --git a/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss b/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
index abfc4edb70..51a213192c 100644
--- a/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
+++ b/res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
@@ -95,6 +95,11 @@ limitations under the License.
             border-radius: 4px;
             padding: $spacing-2;
         }
+
+        code:empty {
+            border: unset;
+            padding: unset;
+        }
     }
 
     .mx_WysiwygComposer_Editor_content_placeholder::before {