diff --git a/src/components/controls/PasswordInput/PasswordInput.tsx b/src/components/controls/PasswordInput/PasswordInput.tsx
index 15b9d2eba4..d0354a6f56 100644
--- a/src/components/controls/PasswordInput/PasswordInput.tsx
+++ b/src/components/controls/PasswordInput/PasswordInput.tsx
@@ -38,14 +38,14 @@ export type PasswordInputProps = Omit<TextInputProps, 'type'> & {
 export const PasswordInput = (props: PasswordInputProps) => {
     const {
         autoComplete,
-        showCopyButton,
-        rightContent,
+        controlProps,
         endContent,
-        showRevealButton,
+        rightContent,
+        showCopyButton = false,
+        showCopyTooltip = false,
+        showRevealButton = false,
+        showRevealTooltip = false,
         size = 'm',
-        showCopyTooltip,
-        showRevealTooltip,
-        controlProps,
     } = props;
 
     const [inputValue, setInputValue] = useControlledState(