diff --git a/components/survey/SurveyForm.tsx b/components/survey/SurveyForm.tsx
index 60c3ace..389ebda 100644
--- a/components/survey/SurveyForm.tsx
+++ b/components/survey/SurveyForm.tsx
@@ -62,8 +62,8 @@ const SurveyForm: React.FC<SurveyFormProps> = ({ existingItem }) => {
         ...existingItem,
         content: existingItem?.content || "Нова анкета",
         answers: existingItem?.answers.split(",") || [],
-        publicFrom: existingItem?.publicFrom ? dayjs(existingItem.publicFrom).toISOString() : new Date().toISOString(),
-        publicUntil: existingItem?.publicUntil ? dayjs(existingItem.publicUntil).toISOString() : new Date().toISOString(),
+        publicFrom: existingItem?.publicFrom ? dayjs(existingItem.publicFrom).toISOString() : '',
+        publicUntil: existingItem?.publicUntil ? dayjs(existingItem.publicUntil).toISOString() : null,
     });
 
 
@@ -104,7 +104,7 @@ const SurveyForm: React.FC<SurveyFormProps> = ({ existingItem }) => {
             }
             else {
                 //get all publisherIds and create a message for each
-                const messages = pubs.data.map(pub => {
+                const messages = pubs.map(pub => {
                     return {
                         publisherId: pub.id,
                         content: JSON.stringify({ message: item.content, options: item.answers }),