diff --git a/VERSION b/VERSION
index 75cd92ae..55b1f09d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B2-rc2-30-gfb9b772db0+1
\ No newline at end of file
+B2-rc2-31-g1899d9f1da+1
\ No newline at end of file
diff --git a/client/src/main.c b/client/src/main.c
index 902cb6bd..f8c44de5 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -929,7 +929,6 @@ int eventFilter(void * userdata, SDL_Event * event)
           if (params.useSpiceInput)
           {
             state.serverMode = !state.serverMode;
-            spice_mouse_mode(state.serverMode);
             SDL_SetWindowGrab(state.window, state.serverMode);
             DEBUG_INFO("Server Mode: %s", state.serverMode ? "on" : "off");
 
@@ -1236,6 +1235,7 @@ static int lg_run()
         return -1;
       }
 
+    spice_mouse_mode(true);
     if (!lgCreateThread("spiceThread", spiceThread, NULL, &t_spice))
     {
       DEBUG_ERROR("spice create thread failed");
@@ -1407,7 +1407,6 @@ static int lg_run()
   if (params.captureOnStart)
   {
     state.serverMode = true;
-    spice_mouse_mode(state.serverMode);
     SDL_SetWindowGrab(state.window, state.serverMode);
     DEBUG_INFO("Server Mode: %s", state.serverMode ? "on" : "off");
   }