diff --git a/src/common/InputHandler.ts b/src/common/InputHandler.ts
index 34c99f84..5a0725a4 100644
--- a/src/common/InputHandler.ts
+++ b/src/common/InputHandler.ts
@@ -2500,6 +2500,7 @@ export class InputHandler extends Disposable implements IInputHandler {
       } else if (p === 24) {
         // not underlined
         attr.fg &= ~FgFlags.UNDERLINE;
+        this._processUnderline(UnderlineStyle.NONE, attr);
       } else if (p === 25) {
         // not blink
         attr.fg &= ~FgFlags.BLINK;
diff --git a/src/common/buffer/AttributeData.ts b/src/common/buffer/AttributeData.ts
index e4f464cd..3af3d293 100644
--- a/src/common/buffer/AttributeData.ts
+++ b/src/common/buffer/AttributeData.ts
@@ -36,7 +36,7 @@ export class AttributeData implements IAttributeData {
   public isInverse(): number       { return this.fg & FgFlags.INVERSE; }
   public isBold(): number          { return this.fg & FgFlags.BOLD; }
   public isUnderline(): number     {
-    if (this.hasExtendedAttrs() && this.extended.urlId) {
+    if (this.hasExtendedAttrs() && this.extended.underlineStyle !== UnderlineStyle.NONE) {
       return 1;
     }
     return this.fg & FgFlags.UNDERLINE;