diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index e074800b5d..ac4c31bb2e 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -3368,7 +3368,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return true
                     }
                     
-                    let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: url, queryId: nil, payload: nil, buttonText: buttonText, keepAliveSignal: nil, fromMenu: true)
+                    let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: url, queryId: nil, payload: nil, buttonText: buttonText, keepAliveSignal: nil, fromMenu: true, isSimple: false)
                     let controller = standaloneWebAppController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, params: params, openUrl: { [weak self] url in
                         self?.openUrl(url, concealed: true, forceExternal: true)
                     }, getInputContainerNode: { [weak self] in
@@ -3405,7 +3405,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         guard let strongSelf = self else {
                             return
                         }
-                        let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: url, queryId: nil, payload: nil, buttonText: buttonText, keepAliveSignal: nil, fromMenu: false)
+                        let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: url, queryId: nil, payload: nil, buttonText: buttonText, keepAliveSignal: nil, fromMenu: false, isSimple: true)
                         let controller = standaloneWebAppController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, params: params, openUrl: { [weak self] url in
                             self?.openUrl(url, concealed: true, forceExternal: true)
                         })
@@ -3426,7 +3426,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         guard let strongSelf = self else {
                             return
                         }
-                        let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: result.url, queryId: result.queryId, payload: nil, buttonText: buttonText, keepAliveSignal: result.keepAliveSignal, fromMenu: false)
+                        let params = WebAppParameters(peerId: peerId, botId: peerId, botName: botName, url: result.url, queryId: result.queryId, payload: nil, buttonText: buttonText, keepAliveSignal: result.keepAliveSignal, fromMenu: false, isSimple: false)
                         let controller = standaloneWebAppController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, params: params, openUrl: { [weak self] url in
                             self?.openUrl(url, concealed: true, forceExternal: true)
                         }, completion: { [weak self] in
@@ -10995,7 +10995,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     completion(controller, nil)
                     strongSelf.controllerNavigationDisposable.set(nil)
                 case let .app(bot, botName, _):
-                    let params = WebAppParameters(peerId: peer.id, botId: bot.id, botName: botName, url: nil, queryId: nil, payload: botPayload, buttonText: nil, keepAliveSignal: nil, fromMenu: false)
+                    let params = WebAppParameters(peerId: peer.id, botId: bot.id, botName: botName, url: nil, queryId: nil, payload: botPayload, buttonText: nil, keepAliveSignal: nil, fromMenu: false, isSimple: false)
                     let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
                     let controller = WebAppController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, params: params, replyToMessageId: replyMessageId)
                     controller.openUrl = { [weak self] url in
diff --git a/submodules/WebUI/Sources/WebAppController.swift b/submodules/WebUI/Sources/WebAppController.swift
index 676cceda2d..34df4b4d8a 100644
--- a/submodules/WebUI/Sources/WebAppController.swift
+++ b/submodules/WebUI/Sources/WebAppController.swift
@@ -30,6 +30,7 @@ public struct WebAppParameters {
     let buttonText: String?
     let keepAliveSignal: Signal<Never, KeepWebViewError>?
     let fromMenu: Bool
+    let isSimple: Bool
     
     public init(
         peerId: PeerId,
@@ -40,7 +41,8 @@ public struct WebAppParameters {
         payload: String?,
         buttonText: String?,
         keepAliveSignal: Signal<Never, KeepWebViewError>?,
-        fromMenu: Bool
+        fromMenu: Bool,
+        isSimple: Bool
     ) {
         self.peerId = peerId
         self.botId = botId
@@ -51,6 +53,7 @@ public struct WebAppParameters {
         self.buttonText = buttonText
         self.keepAliveSignal = keepAliveSignal
         self.fromMenu = fromMenu
+        self.isSimple = isSimple
     }
 }
 
@@ -96,6 +99,11 @@ public final class WebAppController: ViewController, AttachmentContainable {
         private var iconDisposable: Disposable?
         private var keepAliveDisposable: Disposable?
         
+        private var didTransitionIn = false
+        private var dismissed = false
+        
+        private var validLayout: (ContainerViewLayout, CGFloat)?
+        
         init(context: AccountContext, controller: WebAppController, present: @escaping (ViewController, Any?) -> Void) {
             self.context = context
             self.controller = controller
@@ -306,8 +314,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
             return nil
         }
         
-        
-        var didTransitionIn = false
         private func animateTransitionIn() {
             guard !self.didTransitionIn, let webView = self.webView else {
                 return
@@ -355,7 +361,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
             }
         }
                 
-        private var validLayout: (ContainerViewLayout, CGFloat)?
         func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
             let previousLayout = self.validLayout?.0
             self.validLayout = (layout, navigationBarHeight)
@@ -420,10 +425,12 @@ public final class WebAppController: ViewController, AttachmentContainable {
              
         private var delayedScriptMessage: WKScriptMessage?
         private func handleScriptMessage(_ message: WKScriptMessage) {
+            guard let controller = self.controller else {
+                return
+            }
             guard let body = message.body as? [String: Any] else {
                 return
             }
-            
             guard let eventName = body["eventName"] as? String else {
                 return
             }
@@ -432,7 +439,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
                 case "web_app_ready":
                     self.animateTransitionIn()
                 case "web_app_data_send":
-                    if let eventData = body["eventData"] as? String {
+                    if controller.isSimple, let eventData = body["eventData"] as? String {
                         self.handleSendData(data: eventData)
                     }
                 case "web_app_setup_main_button":
@@ -471,7 +478,6 @@ public final class WebAppController: ViewController, AttachmentContainable {
             }
         }
         
-        private var dismissed = false
         private func handleSendData(data string: String) {
             guard let controller = self.controller, let buttonText = controller.buttonText, !self.dismissed else {
                 return
@@ -536,6 +542,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
     private let payload: String?
     private let buttonText: String?
     private let fromMenu: Bool
+    private let isSimple: Bool
     private let keepAliveSignal: Signal<Never, KeepWebViewError>?
     private let replyToMessageId: MessageId?
     
@@ -556,6 +563,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
         self.payload = params.payload
         self.buttonText = params.buttonText
         self.fromMenu = params.fromMenu
+        self.isSimple = params.isSimple
         self.keepAliveSignal = params.keepAliveSignal
         self.replyToMessageId = replyToMessageId