diff --git a/frontend/app/components/InternshipEditor.vue b/frontend/app/components/InternshipEditor.vue
index 885ff71..1bb4d03 100644
--- a/frontend/app/components/InternshipEditor.vue
+++ b/frontend/app/components/InternshipEditor.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { CompanyData } from '~/types/company_data';
-import type { Internship, NewInternship } from '~/types/internships';
+import { convertDate, type Internship, type NewInternship } from '~/types/internships';
 import type { User } from '~/types/user';
 
 const rules = {
@@ -48,8 +48,8 @@ const props = defineProps<{
 
 const isValid = ref(false);
 const form = ref({
-    start: props.internship?.start || "",
-    end: props.internship?.end || "",
+    start: props.internship?.start ? convertDate(props.internship.start) : null,
+    end: props.internship?.end ? convertDate(props.internship.end) : null,
     year_of_study: props.internship?.year_of_study || 2025,
     semester: props.internship?.semester || "WINTER",
     company_id: props.internship?.company?.id == undefined ? null : props.internship.company.id,
@@ -59,11 +59,7 @@ const form = ref({
 
 const user = useSanctumUser<User>();
 
-function dateTimeFixup(datetime: Date | string) {
-    if (typeof datetime === 'string') {
-        return datetime;
-    }
-
+function dateTimeFixup(datetime: Date) {
     const year = datetime.getFullYear()
     const month = String(datetime.getMonth() + 1).padStart(2, '0')
     const day = String(datetime.getDate()).padStart(2, '0')
@@ -74,8 +70,8 @@ function triggerSubmit() {
     const new_internship: NewInternship = {
         user_id: user.value?.id!,
         company_id: form.value.company_id!,
-        start: dateTimeFixup(form.value.start as any),
-        end: dateTimeFixup(form.value.end as any),
+        start: dateTimeFixup(form.value.start!),
+        end: dateTimeFixup(form.value.end!),
         year_of_study: form.value.year_of_study,
         semester: form.value.semester,
         position_description: form.value.description
diff --git a/frontend/app/types/internships.ts b/frontend/app/types/internships.ts
index 5f9ce0f..3c1ba3e 100644
--- a/frontend/app/types/internships.ts
+++ b/frontend/app/types/internships.ts
@@ -25,4 +25,28 @@ export interface NewInternship {
     year_of_study: number;
     semester: string;
     position_description: string;
-};
\ No newline at end of file
+};
+
+export function convertDate(date: string): Date {
+    const matcher = /^\d\d.\d\d.\d\d\d\d$/;
+
+    if (!matcher.test(date)) {
+        throw new Error(`Invalid date or format: '${date}'`);
+    }
+
+    const [day, month, year] = date.split('.').map(Number);
+
+    if (day === undefined || month === undefined || year === undefined) {
+        throw new Error(`Unable to parse date parts: '${date}'`);
+    }
+
+    if (month < 1 || month > 12) {
+        throw new Error(`Invalid month: ${month}`);
+    }
+
+    if (day < 1 || day > 31) {
+        throw new Error(`Invalid day: ${day}`);
+    }
+
+    return new Date(year, month - 1, day);
+}
\ No newline at end of file