diff --git a/PayfritWorks/Views/TaskDetailScreen.swift b/PayfritWorks/Views/TaskDetailScreen.swift
index 08c8a87..552119d 100644
--- a/PayfritWorks/Views/TaskDetailScreen.swift
+++ b/PayfritWorks/Views/TaskDetailScreen.swift
@@ -682,13 +682,14 @@ struct TaskDetailScreen: View {
         Task {
             do {
                 try await APIService.shared.acceptTask(taskId: task.taskId)
-                taskAccepted = true
 
                 if task.isChat {
                     // Go directly to chat for chat tasks
+                    // Don't set taskAccepted to avoid triggering unwanted state changes
                     showingChat = true
                 } else {
-                    // Stay on detail screen, start beacon scanning if applicable
+                    // Stay on detail screen
+                    taskAccepted = true
                     if let d = details, d.servicePointId > 0 {
                         startBeaconScanning(d.servicePointId)
                     }