diff --git a/src/interface.c b/src/interface.c
index 07b2b30a2..2d25676d1 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -24929,11 +24929,11 @@ u32 hashconfig_get_kernel_threads (hashcat_ctx_t *hashcat_ctx, const hc_device_p
 
     if (scrypt_l)
     {
-      kernel_threads = 256 / scrypt_l;
+      kernel_threads = KERNEL_THREADS_MAX / scrypt_l;
     }
     else
     {
-      kernel_threads = 256;
+      kernel_threads = KERNEL_THREADS_MAX;
     }
   }
 
diff --git a/src/opencl.c b/src/opencl.c
index 68c2d8714..68cc73a3b 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -3922,22 +3922,22 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
         {
           if (device_param->device_vendor_id == VENDOR_ID_AMD)
           {
-            tmto_start = 3;
+            tmto_start = 4;
           }
           else if (device_param->device_vendor_id == VENDOR_ID_NV)
           {
-            tmto_start = 2;
+            tmto_start = 3;
           }
         }
         else if (hashconfig->hash_mode == 9300)
         {
           if (device_param->device_vendor_id == VENDOR_ID_AMD)
           {
-            tmto_start = 2;
+            tmto_start = 5;
           }
           else if (device_param->device_vendor_id == VENDOR_ID_NV)
           {
-            tmto_start = 4;
+            tmto_start = 3;
           }
         }
       }