diff --git a/src/Pages/GroupTasks/GroupTasksViewModal.js b/src/Pages/GroupTasks/GroupTasksViewModal.js
index 898b101..9ce11d1 100644
--- a/src/Pages/GroupTasks/GroupTasksViewModal.js
+++ b/src/Pages/GroupTasks/GroupTasksViewModal.js
@@ -21,7 +21,6 @@ import {
   GetDuration,
   MyAvatar,
   getUserId,
-  setNativeValue,
 } from "../../utils";
 import { InfoCircleOutlined, LockOutlined } from "@ant-design/icons";
 
@@ -332,6 +331,8 @@ export default function GroupTasksViewModal({ isOpen }) {
                 )}
               </p>
 
+              {console.log(groupTaskSteps[index])}
+
               <Alert
                 message={
                   <b>
@@ -560,7 +561,8 @@ function InputRequiredHandler({
     groupTaskParameterName
   ) => {
     setInputFields((fields) => {
-      return ({ ...fields }[groupTaskParameterName] = inputValue);
+      return ({ ...fields }[groupTaskParameterName] =
+        inputValue === null ? "" : inputValue);
     });
 
     if (taskLockedByUserId !== "") return;
@@ -593,7 +595,10 @@ function InputRequiredHandler({
         SentMessagesCommands.UpdateGroupTaskStepUserInputValue,
         {
           element: `${currentGroupTaskId}-${step}-${groupTaskParameterName}`,
+          groupTaskId: currentGroupTaskId,
+          parameterName: groupTaskParameterName,
           value: inputValue,
+          step: step,
         }
       );
     }, 500);
@@ -653,6 +658,7 @@ function InputRequiredHandler({
                       groupTaskParameter.parameterName
                     )
                   }
+                  value={inputFields[groupTaskParameter.parameterName]}
                 />
               </Form.Item>
             );