diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8cec2debf..a1c93482e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -50,7 +50,9 @@
 # --------------------------------------------------------------------
 # Keep classes from FxR
 # --------------------------------------------------------------------
--keep class org.mozilla.vrbrowser.ui.widgets.WidgetPlacement {*;}
+-keep class org.mozilla.vrbrowser.ui.widgets.WidgetPlacement {*;} # Keep class used in JNI.
+-keep class org.mozilla.vrbrowser.ui.widgets.Windows$** {*;} # Keep state clases used by gson.
+-keep class org.mozilla.browser.engine.SessionStore** {*;} # Keep state clases used by gson.
 
 # --------------------------------------------------------------------
 # Keep classes from HTC SDK