diff --git a/ReminderWave/ContentView.swift b/ReminderWave/ContentView.swift
index 5700029..4e71bab 100644
--- a/ReminderWave/ContentView.swift
+++ b/ReminderWave/ContentView.swift
@@ -14,12 +14,8 @@ struct ContentView: View {
     
     init() {
         let notificationService = LocalNotificationService()
-        
-        let tempContainer = try! ModelContainer(for: Task.self)
-        let tempContext = ModelContext(tempContainer)
-        
         _viewModel = StateObject(wrappedValue: TaskListViewModel(
-            taskService: SwiftDataTaskService(modelContext: tempContext),
+            taskService: SwiftDataTaskService(modelContext: modelContext),
             notificationService: notificationService
         ))
     }
diff --git a/ReminderWave/Views/TaskListView.swift b/ReminderWave/Views/TaskListView.swift
index 368c7eb..96b10c0 100644
--- a/ReminderWave/Views/TaskListView.swift
+++ b/ReminderWave/Views/TaskListView.swift
@@ -33,7 +33,7 @@ struct TaskListView: View {
                     
                     if #available(iOS 17.0, *) {
                         List {
-                            ForEach(viewModel.filteredTasks.sorted(by: { $0.dueDate < $1.dueDate })) { task in
+                            ForEach(viewModel.filteredTasks.sorted(by: { $0.dueDate < $1.dueDate }), id: \.id) { task in
                                 TaskRowView(task: task) {
                                     viewModel.toggleTaskCompletion(task)
                                 }