diff --git a/GstToolkit.cpp b/GstToolkit.cpp
index 0296530..a814762 100644
--- a/GstToolkit.cpp
+++ b/GstToolkit.cpp
@@ -171,6 +171,8 @@ bool GstToolkit::enable_feature (string name, bool enable) {
     }
 
     gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (factory));
+    gst_object_unref (factory);
+
     return true;
 }
 
@@ -188,6 +190,12 @@ bool GstToolkit::has_feature (string name)
     factory = gst_element_factory_find (name.c_str());
     if (!factory) return false;
 
+    GstElement *elem = gst_element_factory_create (factory, NULL);
+    gst_object_unref (factory);
+
+    if (!elem) return false;
+
+    gst_object_unref (elem);
     return true;
 }
 
@@ -205,9 +213,9 @@ string GstToolkit::gst_version()
 
 #if GST_GL_HAVE_PLATFORM_GLX
     // https://gstreamer.freedesktop.org/documentation/nvcodec/index.html?gi-language=c#plugin-nvcodec
-    const char *plugins[11] = { "omxmpeg4videodec", "omxmpeg2dec", "omxh264dec", "vdpaumpegdec",
+    const char *plugins[11] = { "omxmpeg4videodec", "omxmpeg2dec", "omxh264dec", "vaapidecodebin", "vdpaumpegdec",
                                 "nvh264dec", "nvh265dec", "nvmpeg2videodec",
-                                "nvmpeg4videodec", "nvvp8dec", "nvvp9dec", "vaapidecodebin"
+                                "nvmpeg4videodec", "nvvp8dec", "nvvp9dec"
                                };
     const int N = 11;
 #elif GST_GL_HAVE_PLATFORM_CGL
diff --git a/Recorder.cpp b/Recorder.cpp
index cd26ee2..55ac283 100644
--- a/Recorder.cpp
+++ b/Recorder.cpp
@@ -218,10 +218,11 @@ const std::vector<std::string> VideoRecorder::profile_description {
 
 #if GST_GL_HAVE_PLATFORM_GLX
 
+// under GLX (Linux), gstreamer might have nvidia or vaapi encoders
+// the hardware encoder will be filled at first instanciation of VideoRecorder
 std::vector<std::string> VideoRecorder::hardware_encoder;
 std::vector<std::string> VideoRecorder::hardware_profile_description;
 
-// under GLX (Linux), gstreamer might have nvidia encoders
 std::vector<std::string> nvidia_encoder = {
     "nvh264enc",
     "nvh264enc",
@@ -251,7 +252,6 @@ std::vector<std::string> nvidia_profile_description {
     "", "", "", ""
 };
 
-// under GLX (Linux), gstreamer might have vaapi encoders
 std::vector<std::string> vaapi_encoder = {
     "vaapih264enc",
     "vaapih264enc",
@@ -287,6 +287,7 @@ std::vector<std::string> VideoRecorder::hardware_profile_description {
 };
 
 #else
+// in other platforms, no hardware encoder
 std::vector<std::string> VideoRecorder::hardware_encoder;
 std::vector<std::string> VideoRecorder::hardware_profile_description;
 #endif
@@ -302,13 +303,17 @@ const gint    VideoRecorder::framerate_preset_value[3] = { 15, 25, 30 };
 
 VideoRecorder::VideoRecorder() : FrameGrabber()
 {
+    // first run initialization of hardware encoders in linux
 #if GST_GL_HAVE_PLATFORM_GLX
     if (hardware_encoder.size() < 1) {
-        if ( glGetString(GL_VENDOR)[0] == 'N' && glGetString(GL_VENDOR)[1] == 'V' )    {
+        // test nvidia encoder
+        if ( GstToolkit::has_feature(nvidia_encoder[0] ) )   {
+            // consider that if first nvidia encoder is valid, all others should also be available
             hardware_encoder.assign(nvidia_encoder.begin(), nvidia_encoder.end());
             hardware_profile_description.assign(nvidia_profile_description.begin(), nvidia_profile_description.end());
         }
-        else {
+        // test vaapi encoder
+        else if ( GstToolkit::has_feature(vaapi_encoder[0] ) ) {
             hardware_encoder.assign(vaapi_encoder.begin(), vaapi_encoder.end());
             hardware_profile_description.assign(vaapi_profile_description.begin(), vaapi_profile_description.end());
         }
@@ -333,7 +338,7 @@ std::string VideoRecorder::init(GstCaps *caps)
         Settings::application.record.profile = H264_STANDARD;
 
     // test for a hardware accelerated encoder
-    if (Settings::application.render.gpu_decoding && hardware_encoder.size() > 1 &&
+    if (Settings::application.render.gpu_decoding && (int) hardware_encoder.size() > 0 &&
             GstToolkit::has_feature(hardware_encoder[Settings::application.record.profile]) ) {
 
         description += hardware_profile_description[Settings::application.record.profile];