diff --git a/libunwind/src/DwarfInstructions.hpp b/libunwind/src/DwarfInstructions.hpp
index 18556c6f2d4b..e19383a4027e 100644
--- a/libunwind/src/DwarfInstructions.hpp
+++ b/libunwind/src/DwarfInstructions.hpp
@@ -165,9 +165,10 @@ typename A::capability_t DwarfInstructions<A, R>::getSavedCapabilityRegister(
 #else
     break;
 #endif
+  case CFI_Parser<A>::kRegisterUndefined:
+    return addressSpace.to_capability_t(0);
 
   case CFI_Parser<A>::kRegisterInCFADecrypt: // sparc64 specific
-  case CFI_Parser<A>::kRegisterUndefined:
   case CFI_Parser<A>::kRegisterUnused:
   case CFI_Parser<A>::kRegisterOffsetFromCFA:
     // FIX ME