diff --git a/hashcat.hctune b/hashcat.hctune
index de1014311..e86a5d71b 100644
--- a/hashcat.hctune
+++ b/hashcat.hctune
@@ -464,3 +464,10 @@ ALIAS_Apple_Iris_Pro                            *       13733   1       1
 
 DEVICE_TYPE_GPU                                 *       14600   1       2       1024
 DEVICE_TYPE_GPU                                 *       14800   1       2       1000
+
+###########
+## SCRYPT #
+###########
+
+DEVICE_TYPE_CPU                                 *       8900    1       1       1
+DEVICE_TYPE_CPU                                 *       9300    1       1       1
diff --git a/src/opencl.c b/src/opencl.c
index bf5847702..6c1d13583 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -3716,8 +3716,11 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
         }
       }
 
-      device_param->kernel_accel_min = 1;
-      device_param->kernel_accel_max = 8;
+      if (user_options->kernel_accel_chgd == false)
+      {
+        device_param->kernel_accel_min = 1;
+        device_param->kernel_accel_max = 8;
+      }
 
       const u32 kernel_power_max = device_param->hardware_power * device_param->kernel_accel_max;