diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index ba6b6118cf50..4c951d60bef5 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -2474,8 +2474,7 @@ struct bpf_prog *bpf_prog_select_runtime(struct
 	if (fp->bpf_func)
 		goto finalize;
 
-	if (IS_ENABLED(CONFIG_BPF_JIT_ALWAYS_ON) ||
-	    bpf_prog_has_kfunc_call(fp))
+	if (fp->jit_requested || bpf_prog_has_kfunc_call(fp))
 		jit_needed = true;
 
 	bpf_prog_select_func(fp);