diff --git a/internal/server/server_helper.go b/internal/server/server_helper.go
index 79d76fb..6b75417 100644
--- a/internal/server/server_helper.go
+++ b/internal/server/server_helper.go
@@ -120,6 +120,9 @@ func (s *Server) CreatePeer(device string, peer wireguard.Peer) error {
 	}
 	peer.DeviceName = dev.DeviceName
 	peer.UID = fmt.Sprintf("u%x", md5.Sum([]byte(peer.PublicKey)))
+	if peer.ExpiresAt != nil && peer.ExpiresAt.IsZero() { // convert 01-01-0001 to nil
+		peer.ExpiresAt = nil
+	}
 
 	// Create WireGuard interface
 	if peer.DeactivatedAt == nil {