diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index a702155749..94779e9936 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -79,7 +79,6 @@ struct _Shm_Surface
    int w, h;
    int dx, dy;
    int num_buff;
-   int curr_buff;
 
    Shm_Leaf leaf[MAX_BUFFERS];
    Shm_Leaf *current;
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 6fac50ec2f..68bf028d91 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -251,15 +251,12 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED, Evas_Render_Mode
 Render_Engine_Swap_Mode 
 _evas_outbuf_swapmode_get(Outbuf *ob)
 {
-   int i = 0, n = 0, count = 0, ret = 0;
+   int count = 0, ret = 0;
 
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
-   for (; i < ob->surface->num_buff; i++)
-     {
-        n = (ob->surface->num_buff + ob->surface->curr_buff - (i)) % ob->surface->num_buff;
-        if (ob->surface->leaf[n].busy) count++;
-     }
+   /* This was broken, for now we just do full redraws */
+   return MODE_FULL;
 
    if (count == ob->surface->num_buff) ret = MODE_FULL;
    else if (count == 0) ret = MODE_COPY;
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index ee01f12d01..90df6933bb 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -453,7 +453,7 @@ _evas_shm_surface_post(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int
 
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
-   leaf = &surface->leaf[surface->curr_buff];
+   leaf = surface->current;
    if (!leaf) return;
 
    if (!surface->surface) return;
@@ -478,4 +478,5 @@ _evas_shm_surface_post(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int
    wl_surface_commit(surface->surface);
 
    leaf->busy = 1;
+   surface->current = NULL;
 }