diff --git a/src/remake.jl b/src/remake.jl
index f640ac7..c1dbc47 100644
--- a/src/remake.jl
+++ b/src/remake.jl
@@ -55,6 +55,8 @@ function remake_buffer(sys, oldbuffer::AbstractArray, idxs, vals)
     return newbuffer
 end
 
+remake_buffer(sys, ::Nothing, idxs, vals) = nothing
+
 function remake_buffer(sys, oldbuffer, idxs, vals)
     remake_buffer(sys, oldbuffer, Dict(idxs .=> vals))
 end
diff --git a/test/remake_test.jl b/test/remake_test.jl
index e7312c3..ce261c2 100644
--- a/test/remake_test.jl
+++ b/test/remake_test.jl
@@ -71,3 +71,5 @@ for (buf, newbuf, idxs, vals) in [
     @test newbuf == _newbuf # test values
     @test typeof(newbuf) == typeof(_newbuf) # ensure appropriate type
 end
+
+@test isnothing(remake_buffer(sys, nothing, [], []))