diff --git a/src/models/ctx/update_events.rs b/src/models/ctx/update_events.rs
index f15ac2b1b..0157e579b 100644
--- a/src/models/ctx/update_events.rs
+++ b/src/models/ctx/update_events.rs
@@ -42,7 +42,7 @@ fn get_modal<E: Env + 'static>() -> Effect {
     };
 
     EffectFuture::Concurrent(
-        fetch_api::<E, _, _, GetModalResponse>(&request)
+        fetch_api::<E, _, _, Option<GetModalResponse>>(&request)
             .map_err(CtxError::from)
             .and_then(|result| match result {
                 APIResult::Ok { result } => future::ok(result),
@@ -60,7 +60,7 @@ fn get_notification<E: Env + 'static>() -> Effect {
     };
 
     EffectFuture::Concurrent(
-        fetch_api::<E, _, _, GetNotificationResponse>(&request)
+        fetch_api::<E, _, _, Option<GetNotificationResponse>>(&request)
             .map_err(CtxError::from)
             .and_then(|result| match result {
                 APIResult::Ok { result } => future::ok(result),
diff --git a/src/runtime/msg/internal.rs b/src/runtime/msg/internal.rs
index 2b1c22266..71965a379 100644
--- a/src/runtime/msg/internal.rs
+++ b/src/runtime/msg/internal.rs
@@ -119,7 +119,10 @@ pub enum Internal {
     /// The result of querying the data for LocalSearch
     LoadLocalSearchResult(Url, Result<Vec<Searchable>, EnvError>),
     /// Result for getModal request
-    GetModalResult(APIRequest, Result<GetModalResponse, CtxError>),
+    GetModalResult(APIRequest, Result<Option<GetModalResponse>, CtxError>),
     /// Result for getNotification request
-    GetNotificationResult(APIRequest, Result<GetNotificationResponse, CtxError>),
+    GetNotificationResult(
+        APIRequest,
+        Result<Option<GetNotificationResponse>, CtxError>,
+    ),
 }
diff --git a/src/types/events/events.rs b/src/types/events/events.rs
index ddcf2a40c..4aaaa8fd9 100644
--- a/src/types/events/events.rs
+++ b/src/types/events/events.rs
@@ -7,6 +7,6 @@ use crate::{
 
 #[derive(Default, PartialEq, Eq, Serialize, Clone, Debug)]
 pub struct Events {
-    pub modal: Loadable<GetModalResponse, CtxError>,
-    pub notification: Loadable<GetNotificationResponse, CtxError>,
+    pub modal: Loadable<Option<GetModalResponse>, CtxError>,
+    pub notification: Loadable<Option<GetNotificationResponse>, CtxError>,
 }
diff --git a/src/unit_tests/ctx/events.rs b/src/unit_tests/ctx/events.rs
index 4de268995..ec79133f3 100644
--- a/src/unit_tests/ctx/events.rs
+++ b/src/unit_tests/ctx/events.rs
@@ -25,25 +25,25 @@ fn test_events() {
         match request {
             Request { url, .. } if url == "https://api.strem.io/api/getModal" => {
                 future::ok(Box::new(APIResult::Ok {
-                    result: GetModalResponse {
+                    result: Some(GetModalResponse {
                         id: "id".to_owned(),
                         title: "title".to_owned(),
                         message: "message".to_owned(),
                         image_url: "https://image_url".parse().unwrap(),
                         addon: None,
                         external_url: None,
-                    },
+                    }),
                 }) as Box<dyn Any + Send>)
                 .boxed_env()
             }
             Request { url, .. } if url == "https://api.strem.io/api/getNotification" => {
                 future::ok(Box::new(APIResult::Ok {
-                    result: GetNotificationResponse {
+                    result: Some(GetNotificationResponse {
                         id: "id".to_owned(),
                         title: "title".to_owned(),
                         message: "message".to_owned(),
                         external_url: None,
-                    },
+                    }),
                 }) as Box<dyn Any + Send>)
                 .boxed_env()
             }