diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
index 567c31814d..12fe2c7726 100644
--- a/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
+++ b/webapp/packages/core-blocks/src/ObjectPropertyInfoForm/ObjectPropertyInfoForm.tsx
@@ -16,6 +16,7 @@ import { useStyles } from '@cloudbeaver/core-theming';
 
 import { FormFieldDescription } from '../FormControls/FormFieldDescription';
 import { FormGroup } from '../FormControls/FormGroup';
+import { isControlPresented } from '../FormControls/isControlPresented';
 import { Link } from '../Link';
 import { TextPlaceholder } from '../TextPlaceholder';
 import { formStyles } from './formStyles';
@@ -59,8 +60,8 @@ const RenderField: React.FC<RenderFieldProps> = observer(function RenderField({
     description = 'Password saved';
   }
 
-  if (!editable && property.value) {
-    return (
+  if (!editable) {
+    return autoHide && !isControlPresented(property.id!, state) ? null : (
       <FormFieldDescription label={property.displayName} raw>
         {property.value}
       </FormFieldDescription>