diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c
index 4f8e76c10a3..52d71e702fe 100644
--- a/dll/win32/msafd/misc/dllmain.c
+++ b/dll/win32/msafd/misc/dllmain.c
@@ -2890,6 +2890,10 @@ WSPSetSockOpt(
                   return SOCKET_ERROR;
               }
 
+              /* FIXME: We should not have to limit the packet receive buffer size like this. workaround for CORE-15804 */
+              if (*(PULONG)optval > 0x2000)
+                  *(PULONG)optval = 0x2000;
+
               SetSocketInformation(Socket,
                                    AFD_INFO_RECEIVE_WINDOW_SIZE,
                                    NULL,