diff --git a/rtl/objpas/fmtbcd.pp b/rtl/objpas/fmtbcd.pp
index e922bcb4e4..319e0144e6 100644
--- a/rtl/objpas/fmtbcd.pp
+++ b/rtl/objpas/fmtbcd.pp
@@ -43,8 +43,8 @@
 
 { $define debug_version}
 
-{$r+,q+,s+}
-{ $r-,q-,s-}
+// Dont use s+ (Stack checking on) because it crashes libraries, see bug 21208
+{$r+,q+,s-}
 
 {$mode objfpc}
 {$h-}