diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 2a42ae56d71b..ea768e1f42d8 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -348,6 +348,7 @@ static int tegra_fb_set_windowattr(struct tegra_fb_info *tegra_fb,
 {
 	if (flip_win->handle == NULL) {
 		win->flags = 0;
+		win->cur_handle = NULL;
 		return 0;
 	}