diff --git a/src/handlers/sonarr_handlers/library/add_series_handler.rs b/src/handlers/sonarr_handlers/library/add_series_handler.rs
index 28126d8..a98c2ba 100644
--- a/src/handlers/sonarr_handlers/library/add_series_handler.rs
+++ b/src/handlers/sonarr_handlers/library/add_series_handler.rs
@@ -6,6 +6,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
   ActiveSonarrBlock, ADD_SERIES_BLOCKS, ADD_SERIES_SELECTION_BLOCKS,
 };
 use crate::models::sonarr_models::{AddSeriesBody, AddSeriesOptions, AddSeriesSearchResult};
+use crate::models::stateful_table::StatefulTable;
 use crate::models::{BlockSelectionState, Scrollable};
 use crate::network::sonarr_network::SonarrEvent;
 use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
@@ -31,7 +32,7 @@ impl<'a, 'b> AddSeriesHandler<'a, 'b> {
       .sonarr_data
       .add_searched_series
       .as_mut()
-      .unwrap(),
+      .unwrap_or(&mut StatefulTable::default()),
     AddSeriesSearchResult
   );
 
diff --git a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
index a4db29a..c38ac00 100644
--- a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
@@ -1714,6 +1714,20 @@ mod tests {
     });
   }
 
+  #[test]
+  fn test_add_series_search_no_panic_on_none_search_result() {
+    let mut app = App::default();
+    app.data.sonarr_data.add_series_search = None;
+
+    AddSeriesHandler::with(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::AddSeriesSearchResults,
+      None,
+    )
+    .handle();
+  }
+
   #[test]
   fn test_build_add_series_body() {
     let mut app = App::default();