diff --git a/khatru/adding.go b/khatru/adding.go
index 2b9dfa9..c0e3dfd 100644
--- a/khatru/adding.go
+++ b/khatru/adding.go
@@ -61,7 +61,9 @@ func (rl *Relay) handleNormal(ctx context.Context, evt nostr.Event) (skipBroadca
 	}
 
 	// track event expiration if applicable
-	rl.expirationManager.trackEvent(evt)
+	if rl.expirationManager != nil {
+		rl.expirationManager.trackEvent(evt)
+	}
 
 	return false, nil
 }
diff --git a/khatru/deleting.go b/khatru/deleting.go
index 905d185..08e8405 100644
--- a/khatru/deleting.go
+++ b/khatru/deleting.go
@@ -67,7 +67,9 @@ func (rl *Relay) handleDeleteRequest(ctx context.Context, evt nostr.Event) error
 						}
 
 						// if it was tracked to be expired that is not needed anymore
-						rl.expirationManager.removeEvent(target.ID)
+						if rl.expirationManager != nil {
+							rl.expirationManager.removeEvent(target.ID)
+						}
 					} else {
 						// fail and stop here
 						return fmt.Errorf("blocked: %s", msg)