diff --git a/apps/teacher/src/hooks/use-class-detail-grade-entry.ts b/apps/teacher/src/hooks/use-class-detail-grade-entry.ts
index fdced25a..27ff0d7c 100644
--- a/apps/teacher/src/hooks/use-class-detail-grade-entry.ts
+++ b/apps/teacher/src/hooks/use-class-detail-grade-entry.ts
@@ -6,6 +6,7 @@ import { toast } from 'sonner'
 import { useSync } from '@/hooks/useSync'
 import { useI18nContext } from '@/i18n/i18n-react'
 import { localNotesService } from '@/lib/db/local-notes'
+import { useIsMutationPending } from '@/lib/mutations/use-pending-mutations'
 import { teacherMutationKeys } from '@/lib/queries/keys'
 import { localNotesKeys } from '@/lib/queries/local-notes'
 
@@ -38,6 +39,10 @@ export function useClassDetailGradeEntry({
   const queryClient = useQueryClient()
   const { publishNotes } = useSync()
 
+  const isSavingLocal = useIsMutationPending(teacherMutationKeys.localNotes.save)
+  const isPublishing = useIsMutationPending(teacherMutationKeys.grades.publish)
+  const isSaving = isSavingLocal || isPublishing
+
   const [isEntryMode, setIsEntryMode] = useState(false)
   const [isMetaExpanded, setIsMetaExpanded] = useState(true)
   const [selectedSubjectId, setSelectedSubjectId] = useState<string | null>(null)
@@ -229,7 +234,7 @@ export function useClassDetailGradeEntry({
     handlePublish,
     executePublish,
     handleResumeUnpublished,
-    isSaving: saveMutation.isPending || publishMutation.isPending,
+    isSaving,
     isUnpublishedSheetOpen,
     setIsUnpublishedSheetOpen,
     isConfirmDialogOpen,