diff --git a/messaginginapp/api/messaginginapp.api b/messaginginapp/api/messaginginapp.api
index 788cf4aa..98615b32 100644
--- a/messaginginapp/api/messaginginapp.api
+++ b/messaginginapp/api/messaginginapp.api
@@ -297,17 +297,6 @@ public final class io/customer/messaginginapp/state/InAppMessagingAction$EmbedMe
 public abstract class io/customer/messaginginapp/state/InAppMessagingAction$EngineAction {
 }
 
-public final class io/customer/messaginginapp/state/InAppMessagingAction$EngineAction$Error : io/customer/messaginginapp/state/InAppMessagingAction {
-	public fun <init> (Lio/customer/messaginginapp/gist/data/model/Message;)V
-	public final fun component1 ()Lio/customer/messaginginapp/gist/data/model/Message;
-	public final fun copy (Lio/customer/messaginginapp/gist/data/model/Message;)Lio/customer/messaginginapp/state/InAppMessagingAction$EngineAction$Error;
-	public static synthetic fun copy$default (Lio/customer/messaginginapp/state/InAppMessagingAction$EngineAction$Error;Lio/customer/messaginginapp/gist/data/model/Message;ILjava/lang/Object;)Lio/customer/messaginginapp/state/InAppMessagingAction$EngineAction$Error;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMessage ()Lio/customer/messaginginapp/gist/data/model/Message;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class io/customer/messaginginapp/state/InAppMessagingAction$EngineAction$MessageLoadingFailed : io/customer/messaginginapp/state/InAppMessagingAction {
 	public fun <init> (Lio/customer/messaginginapp/gist/data/model/Message;)V
 	public final fun component1 ()Lio/customer/messaginginapp/gist/data/model/Message;
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt
index e81050ca..689618f4 100644
--- a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt
+++ b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/GistSdk.kt
@@ -80,6 +80,7 @@ class GistSdk(
                     state.event == Lifecycle.Event.ON_RESUME || state.event == Lifecycle.Event.ON_PAUSE
                 }
                 .filter { state ->
+                    // ignore events from GistModalActivity to prevent polling/stopping polling when the in-app is displayed
                     state.activity.get() != null && state.activity.get() !is GistModalActivity
                 }
                 .collect { state ->
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt
index 61331037..a40eb458 100644
--- a/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt
+++ b/messaginginapp/src/main/java/io/customer/messaginginapp/gist/presentation/engine/EngineWebView.kt
@@ -60,14 +60,12 @@ internal class EngineWebView @JvmOverloads constructor(
     fun onLifecycleResumed() {
         logger.info("EngineWebView onLifecycleResumed")
         webView?.let { engineWebViewInterface.attach(webView = it) }
-        super.onAttachedToWindow()
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     fun onLifecyclePaused() {
         logger.info("EngineWebView onLifecyclePaused")
         webView?.let { engineWebViewInterface.detach(webView = it) }
-        super.onDetachedFromWindow()
     }
 
     fun stopLoading() {
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingAction.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingAction.kt
index 3afa89b5..6d7b58dc 100644
--- a/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingAction.kt
+++ b/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingAction.kt
@@ -19,7 +19,6 @@ sealed class InAppMessagingAction {
     sealed class EngineAction {
         data class Tap(val message: Message, val route: String, val name: String, val action: String) : InAppMessagingAction()
         data class MessageLoadingFailed(val message: Message) : InAppMessagingAction()
-        data class Error(val message: Message) : InAppMessagingAction()
     }
 
     object ClearMessageQueue : InAppMessagingAction()
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingMiddlewares.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingMiddlewares.kt
index 183fa1d3..b16daaf0 100644
--- a/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingMiddlewares.kt
+++ b/messaginginapp/src/main/java/io/customer/messaginginapp/state/InAppMessagingMiddlewares.kt
@@ -218,10 +218,6 @@ internal fun gistListenerMiddleware(gistListener: GistListener?) = middleware<In
             gistListener?.onError(action.message)
         }
 
-        is InAppMessagingAction.EngineAction.Error -> {
-            gistListener?.onError(action.message)
-        }
-
         is InAppMessagingAction.EngineAction.Tap -> {
             gistListener?.onAction(action.message, action.route, action.action, action.name)
         }
diff --git a/messaginginapp/src/test/java/io/customer/messaginginapp/InAppMessagingStoreTest.kt b/messaginginapp/src/test/java/io/customer/messaginginapp/InAppMessagingStoreTest.kt
index 715495b5..08f64baa 100644
--- a/messaginginapp/src/test/java/io/customer/messaginginapp/InAppMessagingStoreTest.kt
+++ b/messaginginapp/src/test/java/io/customer/messaginginapp/InAppMessagingStoreTest.kt
@@ -367,7 +367,7 @@ class InAppMessagingStoreTest : IntegrationTest() {
         initializeAndSetUser()
         val message = Message(queueId = "1")
 
-        manager.dispatch(InAppMessagingAction.EngineAction.Error(message))
+        manager.dispatch(InAppMessagingAction.EngineAction.MessageLoadingFailed(message))
 
         verify { inAppEventListener.errorWithMessage(InAppMessage.getFromGistMessage(message)) }
     }