diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index 1b3f5fe29d..198dd09f85 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -200,7 +200,7 @@ static void gfx_ctx_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index 508af52bc3..fd60a8eda4 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -323,11 +323,7 @@ static void gfx_ctx_set_resize(unsigned width, unsigned height)
 static void gfx_ctx_update_window_title(void)
 {
    char buf[128], buf_fps[128];
-   bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), buf_fps, sizeof(buf_fps));
-
-   if (fps_draw && buf_fps != NULL)
-      msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
 static bool gfx_ctx_set_video_mode(
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 689d72827a..9abec0f7df 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/gfx/context/drm_egl_ctx.c
@@ -219,7 +219,7 @@ static void gfx_ctx_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/emscriptenegl_ctx.c b/gfx/context/emscriptenegl_ctx.c
index 16d6b90768..ec650bf64a 100644
--- a/gfx/context/emscriptenegl_ctx.c
+++ b/gfx/context/emscriptenegl_ctx.c
@@ -86,7 +86,7 @@ static void gfx_ctx_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/glx_ctx.c b/gfx/context/glx_ctx.c
index ab0627dcad..488129a64e 100644
--- a/gfx/context/glx_ctx.c
+++ b/gfx/context/glx_ctx.c
@@ -170,7 +170,7 @@ static void gfx_ctx_update_window_title(void)
    if (gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps)))
       XStoreName(g_dpy, g_win, buf);
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 282ce3c3cf..43df50e836 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -192,7 +192,7 @@ static void gfx_ctx_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/vc_egl_ctx.c b/gfx/context/vc_egl_ctx.c
index 60a6633476..dfdef5a7f7 100644
--- a/gfx/context/vc_egl_ctx.c
+++ b/gfx/context/vc_egl_ctx.c
@@ -113,7 +113,7 @@ static void gfx_ctx_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c
index df133034bc..49360994ee 100644
--- a/gfx/context/wgl_ctx.c
+++ b/gfx/context/wgl_ctx.c
@@ -282,7 +282,7 @@ static void gfx_ctx_update_window_title(void)
    if (gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps)))
       SetWindowText(g_hwnd, buf);
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }
 
diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c
index 5767b1a375..379f806579 100644
--- a/gfx/context/xdk_ctx.c
+++ b/gfx/context/xdk_ctx.c
@@ -87,7 +87,7 @@ static void gfx_ctx_xdk_update_window_title(void)
    bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
    gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
    {
       char mem[128];
       MEMORYSTATUS stat;
diff --git a/gfx/context/xegl_ctx.c b/gfx/context/xegl_ctx.c
index a77311a2f0..0dda2fef17 100644
--- a/gfx/context/xegl_ctx.c
+++ b/gfx/context/xegl_ctx.c
@@ -184,7 +184,7 @@ static void gfx_ctx_update_window_title(void)
    if (gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps)))
       XStoreName(g_dpy, g_win, buf);
 
-   if (fps_draw && buf_fps != NULL)
+   if (fps_draw)
       msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
 }