diff --git a/manifest.json b/manifest.json
index 5ff6270c..68e1cbcc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "name": "JDN — Page Object Generator",
   "description": "JDN – helps Test Automation Engineer to create Page Objects in the test automation framework and speed up test development",
   "devtools_page": "index.html",
-  "version": "3.15.21",
+  "version": "3.15.22",
   "icons": {
     "128": "icon128.png"
   },
diff --git a/package-lock.json b/package-lock.json
index 61824f91..b87ea30e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.15.21",
+  "version": "3.15.22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jdn-ai-chrome-extension",
-      "version": "3.15.19",
+      "version": "3.15.21",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 09c023e5..25022002 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.15.21",
+  "version": "3.15.22",
   "description": "jdn-ai chrome extension",
   "scripts": {
     "start": "webpack --watch --env devenv",
diff --git a/src/features/pageObjects/components/PageObjGenerationSettings.tsx b/src/features/pageObjects/components/PageObjGenerationSettings.tsx
index 7f5e2a7e..d7c30dd8 100644
--- a/src/features/pageObjects/components/PageObjGenerationSettings.tsx
+++ b/src/features/pageObjects/components/PageObjGenerationSettings.tsx
@@ -186,7 +186,7 @@ export const PageObjGenerationSettings: React.FC<Props> = ({ pageObj, url, handl
             label="Annotation:"
             id="annotationType"
             disabled={isCurrentFrameworkVividus || !isPageObjectsListUIEnabled}
-            value={currentAnnotation}
+            value={isCurrentFrameworkVividus ? 'Not applicable' : currentAnnotation}
             defaultValue={currentPageObject?.annotationType || AnnotationType.UI}
             onChange={onAnnotationTypeChange}
             options={annotationTypeOptions}
diff --git a/src/features/pageObjects/components/PageObjSettingsItem.tsx b/src/features/pageObjects/components/PageObjSettingsItem.tsx
index 0e912034..9ded4207 100644
--- a/src/features/pageObjects/components/PageObjSettingsItem.tsx
+++ b/src/features/pageObjects/components/PageObjSettingsItem.tsx
@@ -1,5 +1,8 @@
-import { Row, Col, Typography, Select } from 'antd';
+import { Row, Col, Typography, Select, Tooltip } from 'antd';
 import { InternalSelectProps } from 'antd/es/select';
+import { useSelector } from 'react-redux';
+import { FrameworkType } from '../../../common/types/common';
+import { selectCurrentPageObject } from '../selectors/pageObjects.selectors';
 import React from 'react';
 
 type Props = InternalSelectProps & {
@@ -7,21 +10,33 @@ type Props = InternalSelectProps & {
 };
 
 const PageObjSettingsItem = ({ label, disabled, id, value, defaultValue, onChange, options }: Props) => {
+  const currentPageObject = useSelector(selectCurrentPageObject);
+  const isCurrentFrameworkVividus = currentPageObject?.framework === FrameworkType.Vividus;
+  const selectContent = (
+    <Select
+      className="jdn__select"
+      disabled={disabled}
+      id={id}
+      value={value}
+      defaultValue={defaultValue}
+      onChange={onChange}
+      options={options}
+    />
+  );
+
   return (
     <Row>
       <Col flex="104px">
         <Typography.Text style={disabled ? { color: 'rgba(0, 0, 0, 0.25)' } : {}}>{label}</Typography.Text>
       </Col>
       <Col flex="auto">
-        <Select
-          className="jdn__select"
-          disabled={disabled}
-          id={id}
-          value={value}
-          defaultValue={defaultValue}
-          onChange={onChange}
-          options={options}
-        />
+        {isCurrentFrameworkVividus && id === 'annotationType' ? (
+          <Tooltip placement="bottom" title="Not available for Vividus framework">
+            {selectContent}
+          </Tooltip>
+        ) : (
+          selectContent
+        )}
       </Col>
     </Row>
   );