diff --git a/ChangeLog b/ChangeLog
index 2584bb0185..849d74303f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 18 12:11:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/remote_internal.c: Don't free event after queueing it
+	unless error occurred (David Lively)
+
 Thu Dec 18 12:07:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/test.c: Fix error return value
diff --git a/src/remote_internal.c b/src/remote_internal.c
index fcff3cd6ca..2003a0e2c5 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -5535,10 +5535,10 @@ remoteDomainQueueEvent(virConnectPtr conn, XDR *xdr)
         return;
 
     if (virDomainEventQueuePush(priv->domainEvents,
-                                event) < 0)
+                                event) < 0) {
         DEBUG0("Error adding event to queue");
-
-    virDomainEventFree(event);
+        virDomainEventFree(event);
+    }
 }
 
 /** remoteDomainEventFired: