diff --git a/src/blocks/tooltip/Tooltip.tsx b/src/blocks/tooltip/Tooltip.tsx
index 75de60b4d9..75912f0093 100644
--- a/src/blocks/tooltip/Tooltip.tsx
+++ b/src/blocks/tooltip/Tooltip.tsx
@@ -97,21 +97,23 @@ const Tooltip: FC<TooltipProps> = ({
           {children}
         </RadixTooltip.Trigger>
         <RadixTooltip.Portal>
-          <RadixTooltipContent
-            sideOffset={8}
-            {...{ style, width, maxWidth }}
-            {...cssProps}
-            {...props}
-          >
-            {overlay ? (
-              overlay
-            ) : (
-              <>
-                {title && <StyledTitle>{title}</StyledTitle>}
-                {description && <StyledDescription>{description}</StyledDescription>}
-              </>
-            )}
-          </RadixTooltipContent>
+          {(title || overlay || description) && (
+            <RadixTooltipContent
+              sideOffset={8}
+              {...{ style, width, maxWidth }}
+              {...cssProps}
+              {...props}
+            >
+              {overlay ? (
+                overlay
+              ) : (
+                <>
+                  {title && <StyledTitle>{title}</StyledTitle>}
+                  {description && <StyledDescription>{description}</StyledDescription>}
+                </>
+              )}
+            </RadixTooltipContent>
+          )}
         </RadixTooltip.Portal>
       </RadixTooltip.Root>
     </RadixTooltip.Provider>
diff --git a/src/components/UserProfileSettings/AddTelegram.tsx b/src/components/UserProfileSettings/AddTelegram.tsx
index 9f993fd877..2d9adc3c18 100644
--- a/src/components/UserProfileSettings/AddTelegram.tsx
+++ b/src/components/UserProfileSettings/AddTelegram.tsx
@@ -36,8 +36,8 @@ const AddTelegram: FC<AddTelegramProps> = ({
   const { handleConnectWalletAndEnableProfile } = useAppContext();
 
   const caip10WalletAddress = walletToCAIP10({ account });
-  const [step, setStep] = useState(2);
-  const [telegramCode, setTelegramCode] = useState<string>('00000000');
+  const [step, setStep] = useState(1);
+  const [telegramCode, setTelegramCode] = useState<string>('');
   const [isLoading, setIsLoading] = useState(false);
   const { userPushSDKInstance } = useSelector((state: any) => {
     return state.user;
@@ -214,11 +214,13 @@ const AddTelegram: FC<AddTelegramProps> = ({
                 {shortenText(`/verify ${caip10WalletAddress}-${telegramCode}`, 10)}
               </Text>
 
-              <CopyButton
-                tooltipTitle="Copy Address"
-                content={`/verify ${caip10WalletAddress}-${telegramCode}`}
-                size={24}
-              />
+              {isOpen && (
+                <CopyButton
+                  tooltipTitle="Copy Address"
+                  content={`/verify ${caip10WalletAddress}-${telegramCode}`}
+                  size={24}
+                />
+              )}
             </Box>
           </Box>