diff --git a/src/renderer_d3d11.c b/src/renderer_d3d11.c
index d94aa65e..fbdb41c2 100644
--- a/src/renderer_d3d11.c
+++ b/src/renderer_d3d11.c
@@ -1004,7 +1004,10 @@ void renderer_cmd_buffer_send_to_gpu(struct renderer_cmd_buffer *cmdbuff)
                 .BindFlags = D3D11_BIND_VERTEX_BUFFER,
                 .CPUAccessFlags = D3D11_CPU_ACCESS_WRITE
             };
-            /* TODO: Assert res >= 0 (success) */
+            /* TODO: Error checking */
+            if (buffer->gpu_vertex_buffer) {
+                ID3D11Buffer_Release(buffer->gpu_vertex_buffer);
+            }
             ID3D11Device_CreateBuffer(G.dev, &desc, NULL, &buffer->gpu_vertex_buffer);
         }
 
@@ -1017,7 +1020,10 @@ void renderer_cmd_buffer_send_to_gpu(struct renderer_cmd_buffer *cmdbuff)
                 .BindFlags = D3D11_BIND_INDEX_BUFFER,
                 .CPUAccessFlags = D3D11_CPU_ACCESS_WRITE
             };
-            /* TODO: Assert res >= 0 (success) */
+            /* TODO: Error checking */
+            if (buffer->gpu_index_buffer) {
+                ID3D11Buffer_Release(buffer->gpu_index_buffer);
+            }
             ID3D11Device_CreateBuffer(G.dev, &desc, NULL, &buffer->gpu_index_buffer);
         }