diff --git a/src/df/core/df_core.c b/src/df/core/df_core.c
index 704802c2..31765e41 100644
--- a/src/df/core/df_core.c
+++ b/src/df/core/df_core.c
@@ -6183,7 +6183,7 @@ df_query_cached_unwind_from_thread(DF_Entity *thread)
        node->memgen != mem_gen)
     {
       CTRL_Unwind new_unwind = ctrl_unwind_from_thread(scratch.arena, df_state->ctrl_entity_store, thread->ctrl_machine_id, thread->ctrl_handle, os_now_microseconds()+100);
-      if(!(new_unwind.flags & (CTRL_UnwindFlag_Error|CTRL_UnwindFlag_Stale)))
+      if(!(new_unwind.flags & (CTRL_UnwindFlag_Error|CTRL_UnwindFlag_Stale)) && new_unwind.frames.count != 0)
       {
         node->unwind = ctrl_unwind_deep_copy(node->arena, thread->arch, &new_unwind);
         node->reggen = reg_gen;