diff --git a/src/third_party/starboard/rdk/shared/drm/gst_decryptor_ocdm.cc b/src/third_party/starboard/rdk/shared/drm/gst_decryptor_ocdm.cc
index 13d4871..fbffd31 100644
--- a/src/third_party/starboard/rdk/shared/drm/gst_decryptor_ocdm.cc
+++ b/src/third_party/starboard/rdk/shared/drm/gst_decryptor_ocdm.cc
@@ -83,6 +83,10 @@
       gst_buffer_unref(current_key_id_);
       current_key_id_ = nullptr;
     }
+    if (cached_caps_) {
+      gst_caps_unref(cached_caps_);
+      cached_caps_ = nullptr;
+    }
   }
 
   // DrmSystemOcdm::Observer
diff --git a/src/third_party/starboard/rdk/shared/main_rdk.cc b/src/third_party/starboard/rdk/shared/main_rdk.cc
index 864fd9c..61c9ada 100644
--- a/src/third_party/starboard/rdk/shared/main_rdk.cc
+++ b/src/third_party/starboard/rdk/shared/main_rdk.cc
@@ -50,5 +50,7 @@
   int result = application.Run(argc, argv);
 //  starboard::shared::signal::UninstallCrashSignalHandlers();
   starboard::shared::signal::UninstallSuspendSignalHandlers();
+
+  gst_deinit();
   return result;
 }