diff --git a/command_event.c b/command_event.c
index a17ac3d67d..23c17586aa 100644
--- a/command_event.c
+++ b/command_event.c
@@ -922,8 +922,7 @@ bool event_cmd_exec(void *data)
 #if defined(HAVE_DYNAMIC)
    rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL);
 #else
-   if (frontend_driver_has_fork())
-      frontend_driver_set_fork(true, true, false);
+   frontend_driver_set_fork(true, true, false);
 #endif
 
    return true;
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index dd6854f203..daab1c84d9 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -215,7 +215,7 @@ void frontend_driver_set_fork(bool a, bool b, bool restart)
 {
    frontend_ctx_driver_t *frontend = frontend_get_ptr();
 
-   if (!frontend || !frontend->set_fork)
+   if (!frontend_driver_has_fork())
       return;
    frontend->set_fork(a, b, restart);
 }