diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75f3022..6012342 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,17 @@ set (CMAKE_CXX_STANDARD 11)
 
 if (ZOOMFIX)
 add_definitions(-DX_DISPLAY_FIX)
+add_definitions(-DCHANGE_DISPLAY_NAME)
 find_package(X11 REQUIRED)
 link_libraries(${X11_LIBRARIES})
 include_directories(${X11_INCLUDE_DIR})
 # link_directories(${X11_LIBRARIES})
 endif (ZOOMFIX)
 
+if (CHANGE_DISPLAY_NAME)
+add_definitions(-DCHANGE_DISPLAY_NAME)
+endif (CHANGE_DISPLAY_NAME)
+
 add_definitions(-DAVAHI_COMPAT_NOWARN)
 
 add_subdirectory(lib/llhttp)
diff --git a/renderers/video_renderer_gstreamer.c b/renderers/video_renderer_gstreamer.c
index 3252846..9ddb280 100644
--- a/renderers/video_renderer_gstreamer.c
+++ b/renderers/video_renderer_gstreamer.c
@@ -59,16 +59,19 @@ video_renderer_t *video_renderer_init(logger_t *logger, const char *server_name,
 
 #ifdef X_DISPLAY_FIX
     get_x_display_root();
-    g_set_application_name(server_name);
 #endif
 
+#ifdef CHANGE_DISPLAY_NAME
+    g_set_application_name(server_name);
+#endif    
+
     renderer = calloc(1, sizeof(video_renderer_t));
     assert(renderer);
 
     gst_init(NULL, NULL);
 
     renderer->logger = logger;
-     
+ 
     assert(check_plugins ());
 
     GString *launch = g_string_new("appsrc name=video_source stream-type=0 format=GST_FORMAT_TIME is-live=true !"