diff --git a/CHANGELOG.md b/CHANGELOG.md
index da2955e8..435a39dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+- Fix text rendering when text has both underline and shadow
+
 ### 9.2.0 (2023-05-14)
 
 - More controls on clipping
diff --git a/src/shapes/Text.ts b/src/shapes/Text.ts
index 0ee8de55..1214e60b 100644
--- a/src/shapes/Text.ts
+++ b/src/shapes/Text.ts
@@ -607,7 +607,7 @@ export class Text extends Shape<TextConfig> {
   _useBufferCanvas() {
     const hasUnderline = this.textDecoration().indexOf('underline') !== -1;
     const hasShadow = this.hasShadow();
-    if (hasUnderline || hasShadow) {
+    if (hasUnderline && hasShadow) {
       return true;
     }
     return super._useBufferCanvas();