diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 826197000b2baae4b9aefee72a300a6d5fa9b0c2..dd5c6ff32d30959270b813e2da026d5ef66de15f 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -744,6 +744,9 @@ virObjectEventStateQueueRemote(virObjectEventStatePtr state,
                                virObjectEventPtr event,
                                int remoteID)
 {
+    if (!event)
+        return;
+
     if (state->timer < 0) {
         virObjectUnref(event);
         return;
@@ -776,9 +779,6 @@ void
 virObjectEventStateQueue(virObjectEventStatePtr state,
                          virObjectEventPtr event)
 {
-   if (!event)
-       return;
-
     virObjectEventStateQueueRemote(state, event, -1);
 }
 
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c22993ce9ed168f5cbe67836b811d364119470dd..fbec5c727b93ad662fa15e32481a111d4ff517b2 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -4435,8 +4435,7 @@ static void
 remoteEventQueue(struct private_data *priv, virObjectEventPtr event,
                  int remoteID)
 {
-    if (event)
-        virObjectEventStateQueueRemote(priv->eventState, event, remoteID);
+    virObjectEventStateQueueRemote(priv->eventState, event, remoteID);
 }