diff --git a/src/VideoStreaming/VideoStreaming.cc b/src/VideoStreaming/VideoStreaming.cc
index ab5da872de59828fd4892d4bf0e512795292bc95..939ca0afea68a74cd21dd3b35eac1d5da89f34a7 100644
--- a/src/VideoStreaming/VideoStreaming.cc
+++ b/src/VideoStreaming/VideoStreaming.cc
@@ -114,7 +114,16 @@ void initializeVideoStreaming(int &argc, char* argv[])
 
 void shutdownVideoStreaming()
 {
+    /* From: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-deinit
+     *
+     * "It is normally not needed to call this function in a normal application as the resources will automatically
+     * be freed when the program terminates. This function is therefore mostly used by testsuites and other memory
+     * profiling tools."
+     *
+     * It's causing a hang on exit. It hangs while deleting some thread.
+     *
 #if defined(QGC_GST_STREAMING)
     gst_deinit();
 #endif
+    */
 }