diff --git a/intel/geoip/database.go b/intel/geoip/database.go
index 5b0059a6..17ee2f13 100644
--- a/intel/geoip/database.go
+++ b/intel/geoip/database.go
@@ -67,6 +67,9 @@ func (ub *updateBroadcaster) ReplaceDatabase(db *geoIPDB) {
 // notifyWaiters notifies and removes all waiters. Must be called
 // with ub.rw locked.
 func (ub *updateBroadcaster) notifyWaiters() {
+	if ub.waiter == nil {
+		return
+	}
 	waiter := ub.waiter
 	ub.waiter = nil
 	close(waiter)