diff --git a/reactos/win32ss/include/ntuser.h b/reactos/win32ss/include/ntuser.h
index 8a0085a78d8..b23c4a1f527 100644
--- a/reactos/win32ss/include/ntuser.h
+++ b/reactos/win32ss/include/ntuser.h
@@ -2296,7 +2296,8 @@ enum ThreadStateRoutines
     THREADSTATE_GETINPUTSTATE,
     THREADSTATE_UPTIMELASTREAD,
     THREADSTATE_FOREGROUNDTHREAD,
-    THREADSTATE_GETCURSOR
+    THREADSTATE_GETCURSOR,
+    THREADSTATE_GETMESSAGEEXTRAINFO
 };
 
 DWORD_PTR
@@ -3375,7 +3376,6 @@ typedef struct tagKMDDELPARAM
  */
 
 #define NOPARAM_ROUTINE_ISCONSOLEMODE         0xffff0001
-#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO   0xffff0005
 #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING   0xfffe0008
 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d
 #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING    0xfffe000e
diff --git a/reactos/win32ss/user/ntuser/misc.c b/reactos/win32ss/user/ntuser/misc.c
index 40ec94d227b..1228b5cac8a 100644
--- a/reactos/win32ss/user/ntuser/misc.c
+++ b/reactos/win32ss/user/ntuser/misc.c
@@ -271,6 +271,9 @@ NtUserGetThreadState(
          ret = (DWORD_PTR) (GetW32ThreadInfo()->MessageQueue->CursorObject ?
                             UserHMGetHandle(GetW32ThreadInfo()->MessageQueue->CursorObject) : 0);
          break;
+      case THREADSTATE_GETMESSAGEEXTRAINFO:
+         ret = (DWORD_PTR)MsqGetMessageExtraInfo();
+        break;
    }
 
    TRACE("Leave NtUserGetThreadState, ret=%lu\n", ret);
diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
index 74bfd739c22..2cb712360cf 100644
--- a/reactos/win32ss/user/ntuser/simplecall.c
+++ b/reactos/win32ss/user/ntuser/simplecall.c
@@ -87,10 +87,6 @@ NtUserCallNoParam(DWORD Routine)
          Result = (DWORD_PTR)IntUninitMessagePumpHook();
          break;
 
-      case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO:
-         Result = (DWORD_PTR)MsqGetMessageExtraInfo();
-         break;
-
       case NOPARAM_ROUTINE_MSQCLEARWAKEMASK:
          RETURN( (DWORD_PTR)IntMsqClearWakeMask());
 
diff --git a/reactos/win32ss/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
index 8da9a027914..133f82f86a3 100644
--- a/reactos/win32ss/user/user32/include/ntwrapper.h
+++ b/reactos/win32ss/user/user32/include/ntwrapper.h
@@ -788,7 +788,7 @@ EXTINLINE BOOL NtUserxSetForegroundWindow(HWND hWnd)
 
 EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID)
 {
-  return (LPARAM)NtUserCallNoParam(NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO);
+  return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
 }
 
 EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo)