diff --git a/crates/torii/cli/src/args.rs b/crates/torii/cli/src/args.rs
index 13c43655b0..8b8a73175b 100644
--- a/crates/torii/cli/src/args.rs
+++ b/crates/torii/cli/src/args.rs
@@ -257,7 +257,7 @@ mod test {
         db_dir = "/tmp/torii-test"
 
         [events]
-        raw = false
+        raw = true
         historical = [
             "ns-E",
             "ns-EH"
@@ -291,7 +291,7 @@ mod test {
         assert_eq!(torii_args.world_address, Some(Felt::from_str("0x1234").unwrap()));
         assert_eq!(torii_args.rpc, Url::parse("http://0.0.0.0:2222").unwrap());
         assert_eq!(torii_args.db_dir, Some(PathBuf::from("/tmp/torii-test")));
-        assert!(!torii_args.events.raw);
+        assert!(torii_args.events.raw);
         assert_eq!(torii_args.events.historical, vec!["ns-E".to_string(), "ns-EH".to_string()]);
         assert_eq!(torii_args.indexing.events_chunk_size, 9999);
         assert_eq!(torii_args.indexing.blocks_chunk_size, 10240);
diff --git a/crates/torii/cli/src/options.rs b/crates/torii/cli/src/options.rs
index 697ac5f623..48fc62915d 100644
--- a/crates/torii/cli/src/options.rs
+++ b/crates/torii/cli/src/options.rs
@@ -210,7 +210,7 @@ impl IndexingOptions {
     }
 }
 
-#[derive(Debug, clap::Args, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, clap::Args, Clone, Serialize, Deserialize, PartialEq, Default)]
 #[command(next_help_heading = "Events indexing options")]
 pub struct EventsOptions {
     /// Whether or not to index raw events
@@ -229,12 +229,6 @@ pub struct EventsOptions {
     pub historical: Vec<String>,
 }
 
-impl Default for EventsOptions {
-    fn default() -> Self {
-        Self { raw: true, historical: vec![] }
-    }
-}
-
 #[derive(Debug, clap::Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "HTTP server options")]
 pub struct ServerOptions {