diff --git a/retro-runner/retro-environment.c b/retro-runner/retro-environment.c
index a2bba0d5616a3fb2390c84e809f9123e8c6476e5..9a78b762c05a816434254591c5e58d1ddb5738ae 100644
--- a/retro-runner/retro-environment.c
+++ b/retro-runner/retro-environment.c
@@ -493,7 +493,14 @@ set_hw_render (RetroCore             *self,
   g_assert (self);
   g_return_val_if_fail (callback, FALSE);
 
+  g_clear_object (&self->renderer);
+
   switch (callback->context_type) {
+  case RETRO_HW_CONTEXT_NONE:
+    retro_debug ("Set hardware render callback: none, use software rendering");
+
+    return TRUE;
+
   case RETRO_HW_CONTEXT_OPENGL:
   case RETRO_HW_CONTEXT_OPENGL_CORE:
   case RETRO_HW_CONTEXT_OPENGLES2: