diff --git a/components/survey/SurveyForm.tsx b/components/survey/SurveyForm.tsx
index 389ebda..6d9e040 100644
--- a/components/survey/SurveyForm.tsx
+++ b/components/survey/SurveyForm.tsx
@@ -213,13 +213,16 @@ const SurveyForm: React.FC<SurveyFormProps> = ({ existingItem }) => {
                     <label className="block text-gray-700 text-sm font-bold mb-2" htmlFor="date">
                         Видима от
                     </label>
-                    <DatePicker className="textbox form-input px-4 py-2 rounded" name="publicFrom" onChange={(newDate) => handleDateChange('publicFrom', newDate)} value={dayjs(item?.publicFrom)} />
+                    <DatePicker className="textbox form-input px-4 py-2 rounded" name="publicFrom" onChange={(newDate) => handleDateChange('publicFrom', newDate)}
+                        value={item && item.publicFrom ? dayjs(item.publicFrom) : null} />
                 </div>
                 <div className="mb-4">
                     <label className="block text-gray-700 text-sm font-bold mb-2" htmlFor="date">
                         Видима до
                     </label>
-                    <DatePicker className="textbox form-input px-4 py-2 rounded" name="publicUntil" onChange={(newDate) => handleDateChange('publicUntil', newDate)} value={dayjs(item?.publicUntil)} />
+                    <DatePicker className="textbox form-input px-4 py-2 rounded" name="publicUntil" onChange={(newDate) => handleDateChange('publicUntil', newDate)}
+                        value={item && item.publicUntil ? dayjs(item.publicUntil) : null}
+                    />
                 </div>
                 <div className="mb-4">
                     <label className="block text-gray-700 text-sm font-bold mb-2" htmlFor="content">
diff --git a/prisma/migrations/20240621124135_/migration.sql b/prisma/migrations/20240621124135_/migration.sql
index 9063825..5dc706d 100644
--- a/prisma/migrations/20240621124135_/migration.sql
+++ b/prisma/migrations/20240621124135_/migration.sql
@@ -1,5 +1,5 @@
 -- AlterTable
-ALTER TABLE `message` MODIFY `content` TEXT NOT NULL;
+ALTER TABLE `Message` MODIFY `content` TEXT NOT NULL;
 
 -- AlterTable
-ALTER TABLE `survey` MODIFY `content` TEXT NOT NULL;
+ALTER TABLE `Survey` MODIFY `content` TEXT NOT NULL;
\ No newline at end of file