diff --git a/src/mapper/map.rs b/src/mapper/map.rs
index c3d3dd6c..ad88e4fa 100644
--- a/src/mapper/map.rs
+++ b/src/mapper/map.rs
@@ -361,26 +361,6 @@ impl EventWriter {
             };
         }
 
-        // TODO: add witness set data to transaction
-        /*
-        if let Some(witness) = self.transaction_witness_sets.get(idx) {
-            let plutus_count = match &witness.plutus_script {
-                Some(scripts) => scripts.len(),
-                None => 0,
-            };
-
-            let native_count = match &witness.native_script {
-                Some(scripts) => scripts.len(),
-                None => 0,
-            };
-
-            let redeemer_count = match &witness.redeemer {
-                Some(redeemer) => redeemer.len(),
-                None => 0,
-            };
-        }
-        */
-
         if self.config.include_transaction_details {
             record.metadata = match aux_data {
                 Some(aux_data) => self.collect_metadata_records(aux_data)?.into(),
diff --git a/src/mapper/shelley.rs b/src/mapper/shelley.rs
index 4f0ffcdf..ce668976 100644
--- a/src/mapper/shelley.rs
+++ b/src/mapper/shelley.rs
@@ -232,6 +232,19 @@ impl EventWriter {
             self.append(EventData::BlockEnd(record))?;
         }
 
+        for witness in block.transaction_witness_sets.iter() {
+            if let Some(native) = &witness.native_script {
+                for script in native.iter() {
+                    self.append(self.to_native_script_event(script))?;
+                }
+            }
+            if let Some(plutus) = &witness.plutus_script {
+                for script in plutus.iter() {
+                    self.append(self.to_plutus_script_event(script))?;
+                }
+            }
+        }
+
         Ok(())
     }