diff --git a/src/system/kernel/syscalls.cpp b/src/system/kernel/syscalls.cpp
index 9e07c3344c..4046ef13dd 100644
--- a/src/system/kernel/syscalls.cpp
+++ b/src/system/kernel/syscalls.cpp
@@ -418,7 +418,8 @@ class PostSyscall : public AbstractTraceEntry {
 		{
 			Initialized();
 #if 0
-			if (returnValue != (returnValue & 0xffffffff)
+			if (syscall < (uint32)kSyscallCount
+				&&  returnValue != (returnValue & 0xffffffff)
 				&& kExtendedSyscallInfos[syscall].return_type.size <= 4) {
 				panic("syscall return value 64 bit although it should be 32 "
 					"bit");