diff --git a/fuchsia/main.cc b/fuchsia/main.cc
index e5ecd9a..d324398 100644
--- a/fuchsia/main.cc
+++ b/fuchsia/main.cc
@@ -17,10 +17,17 @@
     return -1;
   }
 
-  CodecRunnerApp<CodecAdapterVaApiDecoder, CodecAdapterVaApiEncoder> codec_runner;
-  codec_runner.Init();
-  codec_runner.Serve();
-  codec_runner.Run();
+  {
+    CodecRunnerApp<CodecAdapterVaApiDecoder, CodecAdapterVaApiEncoder> codec_runner;
+    codec_runner.Init();
+    codec_runner.Serve();
+    codec_runner.Run();
+  }  // ~codec_runner
+
+  if (!VADisplayWrapper::DestroySingleton()) {
+    fprintf(stderr, "Failed to terminate VADisplay\n");
+    return -1;
+  }
 
   return 0;
 }