diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 244290b8..99431d0b 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -649,6 +649,7 @@ err_desktop:
 	weston_desktop_destroy(shell->desktop);
 
 err_shell:
+	wl_list_remove(&shell->destroy_listener.link);
 	free(shell);
 
 	return IVI_FAILED;