diff --git a/docs/src/pages/components/PasswordInput.svx b/docs/src/pages/components/PasswordInput.svx
index 6f503974..a67c2099 100644
--- a/docs/src/pages/components/PasswordInput.svx
+++ b/docs/src/pages/components/PasswordInput.svx
@@ -50,3 +50,7 @@ Set prop `type` to `"text"` to toggle password visibility.
 ## Disabled state
 
 <PasswordInput disabled labelText="Password" placeholder="Enter password..." />
+
+## With helper text
+
+<PasswordInput helperText="Your password should be hard to guess" labelText="Password" placeholder="Enter password..." />
diff --git a/src/TextInput/PasswordInput.svelte b/src/TextInput/PasswordInput.svelte
index 3fe598a9..a8ce24b1 100644
--- a/src/TextInput/PasswordInput.svelte
+++ b/src/TextInput/PasswordInput.svelte
@@ -248,7 +248,7 @@
         {invalidText}
       </div>
     {/if}
-    {#if !invalid && !warn && !isFluid && !inline}
+    {#if !invalid && !warn && !isFluid && !inline && helperText}
       <div
         class:bx--form__helper-text="{true}"
         class:bx--form__helper-text--disabled="{disabled}"