diff --git a/app/assets/javascripts/discourse/app/components/d-modal.hbs b/app/assets/javascripts/discourse/app/components/d-modal.hbs
index 3d56cb2f19f..c9c2f14611a 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-modal.hbs
@@ -70,7 +70,7 @@
               role="alert"
               class={{concat-class
                 "alert"
-                (concat "alert-" (or @flashType "success"))
+                (if @flashType (concat "alert-" @flashType))
               }}
             >
               {{~@flash~}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js
index fd84f89d2e3..0349fcca19e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-modal-test.js
@@ -39,10 +39,15 @@ module("Integration | Component | d-modal", function (hooks) {
   });
 
   test("flash", async function (assert) {
+    await render(hbs`<DModal @inline={{true}} @flash="Some message"/>`);
+    assert.dom(".d-modal .alert").hasText("Some message");
+  });
+
+  test("flash type", async function (assert) {
     await render(
-      hbs`<DModal @inline={{true}} @flash="Some message" @flashType="error"/> `
+      hbs`<DModal @inline={{true}} @flash="Some message" @flashType="success"/>`
     );
-    assert.dom(".d-modal .alert.alert-error").hasText("Some message");
+    assert.dom(".d-modal .alert").hasClass("alert-success");
   });
 
   test("dismissable", async function (assert) {