diff --git a/src/systems/diffeqs/abstractodesystem.jl b/src/systems/diffeqs/abstractodesystem.jl
index eeac9c7626..518b48e929 100644
--- a/src/systems/diffeqs/abstractodesystem.jl
+++ b/src/systems/diffeqs/abstractodesystem.jl
@@ -215,7 +215,7 @@ function generate_function(sys::AbstractODESystem, dvs = unknowns(sys),
     if isdde
         build_function(rhss, u, DDE_HISTORY_FUN, p..., t; kwargs...,
             wrap_code = wrap_code .∘ wrap_mtkparameters(sys, false, 3) .∘
-                        wrap_array_vars(sys, rhss; dvs, ps) .∘
+                        wrap_array_vars(sys, rhss; dvs, ps, history = true) .∘
                         wrap_parameter_dependencies(sys, false))
     else
         pre, sol_states = get_substitutions_and_solved_unknowns(sys)
@@ -598,17 +598,14 @@ function DiffEqBase.SDDEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys
         expression_module = eval_module, checkbounds = checkbounds,
         kwargs...)
     f_oop, f_iip = eval_or_rgf.(f_gen; eval_expression, eval_module)
+    f(u, h, p, t) = f_oop(u, h, p, t)
+    f(du, u, h, p, t) = f_iip(du, u, h, p, t)
+
     g_gen = generate_diffusion_function(sys, dvs, ps; expression = Val{true},
         isdde = true, kwargs...)
     g_oop, g_iip = eval_or_rgf.(g_gen; eval_expression, eval_module)
-    f(u, h, p, t) = f_oop(u, h, p, t)
-    f(u, h, p::MTKParameters, t) = f_oop(u, h, p..., t)
-    f(du, u, h, p, t) = f_iip(du, u, h, p, t)
-    f(du, u, h, p::MTKParameters, t) = f_iip(du, u, h, p..., t)
     g(u, h, p, t) = g_oop(u, h, p, t)
-    g(u, h, p::MTKParameters, t) = g_oop(u, h, p..., t)
     g(du, u, h, p, t) = g_iip(du, u, h, p, t)
-    g(du, u, h, p::MTKParameters, t) = g_iip(du, u, h, p..., t)
 
     SDDEFunction{iip}(f, g, sys = sys)
 end
diff --git a/src/systems/diffeqs/sdesystem.jl b/src/systems/diffeqs/sdesystem.jl
index 9f3814774f..011ba6e216 100644
--- a/src/systems/diffeqs/sdesystem.jl
+++ b/src/systems/diffeqs/sdesystem.jl
@@ -302,7 +302,11 @@ function generate_diffusion_function(sys::SDESystem, dvs = unknowns(sys),
         (map(x -> time_varying_as_func(value(x), sys), ps),)
     end
     if isdde
-        return build_function(eqs, u, DDE_HISTORY_FUN, p..., get_iv(sys); kwargs...)
+        return build_function(eqs, u, DDE_HISTORY_FUN, p..., get_iv(sys); kwargs...,
+            wrap_code = get(kwargs, :wrap_code, identity) .∘
+                        wrap_mtkparameters(sys, false, 3) .∘
+                        wrap_array_vars(sys, eqs; dvs, ps, history = true) .∘
+                        wrap_parameter_dependencies(sys, false))
     else
         return build_function(eqs, u, p..., get_iv(sys); kwargs...)
     end
diff --git a/test/dde.jl b/test/dde.jl
index c6e64fc1a5..aa4536e604 100644
--- a/test/dde.jl
+++ b/test/dde.jl
@@ -186,4 +186,15 @@ end
 
     alg = MethodOfSteps(Vern7())
     @test_nowarn solve(prob, alg)
+
+    @brownian r
+    eqs = [D(x(t)) ~ -w * x(t - τ) + r]
+    @named sys = System(eqs, t)
+    sys = structural_simplify(sys)
+    prob = SDDEProblem(sys,
+        [],
+        (0.0, 10.0),
+        constant_lags = [τ])
+
+    @test_nowarn solve(prob, RKMil())
 end