diff --git a/system/sched_note/note_main.c b/system/sched_note/note_main.c
index 49f210826..948925cfb 100644
--- a/system/sched_note/note_main.c
+++ b/system/sched_note/note_main.c
@@ -188,6 +188,7 @@ static void dump_notes(size_t nread)
             }
             break;
 
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
           case NOTE_SUSPEND:
             {
               FAR struct note_suspend_s *note_suspend =
@@ -250,6 +251,7 @@ static void dump_notes(size_t nread)
 #endif
             }
             break;
+#endif
 
 #ifdef CONFIG_SMP
           case NOTE_CPU_START:
@@ -292,6 +294,7 @@ static void dump_notes(size_t nread)
             }
             break;
 
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
           case NOTE_CPU_PAUSE:
             {
               FAR struct note_cpu_pause_s *note_pause =
@@ -372,6 +375,7 @@ static void dump_notes(size_t nread)
             }
             break;
 #endif
+#endif
 
 #ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
           case NOTE_PREEMPT_LOCK:
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index 9e18c8034..3f0731ac5 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -398,6 +398,7 @@ static int trace_dump_one(FAR FILE *out,
         }
         break;
 
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
       case NOTE_SUSPEND:
         {
           FAR struct note_suspend_s *nsu = (FAR struct note_suspend_s *)p;
@@ -441,6 +442,7 @@ static int trace_dump_one(FAR FILE *out,
             }
         }
         break;
+#endif
 
 #ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
       case NOTE_SYSCALL_ENTER: