diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index f82e09b..546b499 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -166,8 +166,11 @@ class  InputFieldViewController: BaseViewController<InputField> {
     }
     
     func updateTooltip() {
-        component.tooltipModel = .init(title: tooltipTitleTextField.text,
-                                       content: tooltipContentTextField.text)
+        let title = tooltipTitleTextField.text ?? ""
+        let content = tooltipContentTextField.text ?? ""
+        
+        component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title,
+                                                                            content: content) : nil
     }
 }
 
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index a08f12e..6420088 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -166,8 +166,12 @@ class  TextAreaViewController: BaseViewController<TextArea> {
     }
     
     func updateTooltip() {
-        component.tooltipModel = .init(title: tooltipTitleTextField.text,
-                                       content: tooltipContentTextField.text)
+        let title = tooltipTitleTextField.text ?? ""
+        let content = tooltipContentTextField.text ?? ""
+        
+        component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title,
+                                                                            content: content) : nil
+
     }
 
 }