diff --git a/src/components/common/DatePicker.jsx b/src/components/common/DatePicker.jsx
index d00b6329..9a3890fa 100644
--- a/src/components/common/DatePicker.jsx
+++ b/src/components/common/DatePicker.jsx
@@ -9,6 +9,7 @@ const DatePicker = ({
   allowText = false,
   maxDate,
   minDate,
+  disabled = false,
   ...rest
 }) => {
   const inputRef = useRef(null);
@@ -64,6 +65,7 @@ const DatePicker = ({
         }}
         readOnly={!allowText}
         autoComplete="off"
+        disabled={disabled}
       />
 
       <span
diff --git a/src/components/common/InputSuggestion.jsx b/src/components/common/InputSuggestion.jsx
index de5579f4..5f6a8c52 100644
--- a/src/components/common/InputSuggestion.jsx
+++ b/src/components/common/InputSuggestion.jsx
@@ -5,6 +5,7 @@ const InputSuggestions = ({
   value,
   onChange,
   error,
+  disabled=false
 }) => {
   const [filteredList, setFilteredList] = useState([]);
   const [showSuggestions, setShowSuggestions] = useState(false);
@@ -34,6 +35,7 @@ const InputSuggestions = ({
         onFocus={() => {
           if (value) setShowSuggestions(true);
         }}
+        disabled={disabled}
       />
       {showSuggestions && filteredList.length > 0 && (
         <ul