diff --git a/frontend/app/components/InternshipEditor.vue b/frontend/app/components/InternshipEditor.vue
index bd496cf..add890c 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 { NewInternship } from '~/types/internships';
+import type { Internship, NewInternship } from '~/types/internships';
 import type { User } from '~/types/user';
 
 const rules = {
@@ -41,51 +41,19 @@ const semester_choices = [
     }
 ];
 
-const props = defineProps({
-    start: {
-        type: String,
-        required: false,
-        default: ''
-    },
-    end: {
-        type: String,
-        required: false,
-        default: ''
-    },
-    year_of_study: {
-        type: Number,
-        required: false,
-        default: 1
-    },
-    semester: {
-        type: String,
-        required: false,
-        default: ''
-    },
-    company_id: {
-        type: Number,
-        required: false,
-        default: -1
-    },
-    description: {
-        type: String,
-        required: false,
-        default: ''
-    },
-    submit: {
-        type: Function as PropType<(internship: NewInternship) => void>,
-        required: true
-    }
-});
+const props = defineProps<{
+    internship?: Internship,
+    submit: (new_internship: NewInternship) => void,
+}>();
 
 const isValid = ref(false);
 const form = ref({
-    start: props.start,
-    end: props.end,
-    year_of_study: props.year_of_study,
-    semester: props.semester,
-    company_id: props.company_id === -1 ? null : props.company_id,
-    description: props.description,
+    start: props.internship?.start || "",
+    end: props.internship?.end || "",
+    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,
+    description: props.internship?.position_description || "",
     consent: false,
 });
 
diff --git a/frontend/app/pages/dashboard/admin/internships/edit/[id].vue b/frontend/app/pages/dashboard/admin/internships/edit/[id].vue
index cef5c1d..369e321 100644
--- a/frontend/app/pages/dashboard/admin/internships/edit/[id].vue
+++ b/frontend/app/pages/dashboard/admin/internships/edit/[id].vue
@@ -67,9 +67,7 @@ const { data, error, refresh } = await useSanctumFetch<Internship>(`/api/interns
                 <div v-else>
                     <div>
                         <h2>Základné informácie</h2>
-                        <InternshipEditor :start="data?.start" :end="data?.end" :year_of_study="data?.year_of_study"
-                            :semester="data?.semester" :company_id="data?.company.id"
-                            :description="data?.position_description" :submit="handleUpdateOfBasicInfo" />
+                        <InternshipEditor :internship="data!" :submit="handleUpdateOfBasicInfo" />
                         <hr />
                     </div>