diff --git a/docs/changes.txt b/docs/changes.txt
index d3213a234..df1c5d9d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -33,6 +33,7 @@
 - Potfile: In v3.10 already, the default potfile suffix changed but the note about was missing. The "hashcat.pot" became "hashcat.potfile"
 - Threads: Replaced all calls to strerror() with %m printf() GNU extension to ensure thread safety
 - Threads: Replaced all calls to ctime() with ctime_r() to ensure thread safety
+- OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.50 is detected which is known to be broken
 
 * changes v3.10 -> v3.20:
 
diff --git a/src/opencl.c b/src/opencl.c
index 452117d3b..029087491 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -2875,6 +2875,8 @@ int opencl_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime)
               #if defined (__linux__)
               // AMDGPU-Pro Driver 16.40 and higher
               if (atoi (device_param->driver_version) >= 2117) amd_warn = false;
+              // AMDGPU-Pro Driver 16.50 is known to be broken
+              if (atoi (device_param->driver_version) == 2236) amd_warn = true;
               #elif defined (_WIN)
               // AMD Radeon Software 14.9 and higher, should be updated to 15.12
               if (atoi (device_param->driver_version) >= 1573) amd_warn = false;