diff --git a/include/gos/chibios.h b/include/gos/chibios.h
index aa98c645..5193587a 100644
--- a/include/gos/chibios.h
+++ b/include/gos/chibios.h
@@ -63,7 +63,7 @@ typedef Thread *	gfxThreadHandle;
 extern "C" {
 #endif
 
-#define gfxHalt(msg)				chDbgPanic(msg)
+#define gfxHalt(msg)				{ chDbgPanic(msg); chSysHalt(); }
 #define gfxExit()					chSysHalt()
 #define gfxAlloc(sz)				chHeapAlloc(NULL, sz)
 #define gfxFree(ptr)				chHeapFree(ptr)