diff --git a/kinesis_manager/src/kinesis_stream_manager.cpp b/kinesis_manager/src/kinesis_stream_manager.cpp
index 1758dd8..fe89da5 100644
--- a/kinesis_manager/src/kinesis_stream_manager.cpp
+++ b/kinesis_manager/src/kinesis_stream_manager.cpp
@@ -318,6 +318,10 @@ void KinesisStreamManager::FreeStream(std::string stream_name)
     }
     video_producer_->FreeStream(video_streams_.at(stream_name));
     video_streams_.erase(stream_name);
+    // Erase stream's codec data
+    if (video_streams_codec_data_.count(stream_name) > 0) {
+      video_streams_codec_data_.erase(stream_name);
+    }
   }
 }