From a1ea3f74b3c88ee8603f0dafe0d3dcb23c56a82a Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Thu, 15 Jan 2026 22:00:13 -0800
Subject: [PATCH] Move the query into the sync

---
 server/routers/newt/handleNewtPingMessage.ts | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/server/routers/newt/handleNewtPingMessage.ts b/server/routers/newt/handleNewtPingMessage.ts
index a4af6872..dc9aacdd 100644
--- a/server/routers/newt/handleNewtPingMessage.ts
+++ b/server/routers/newt/handleNewtPingMessage.ts
@@ -112,28 +112,28 @@ export const handleNewtPingMessage: MessageHandler = async (context) => {
         return;
     }
 
-    // get the site
-    const [site] = await db
-        .select()
-        .from(sites)
-        .where(eq(sites.siteId, newt.siteId))
-        .limit(1);
-
-    if (!site) {
-        logger.warn(
-            `Newt ping message: site with ID ${newt.siteId} not found`
-        );
-        return;
-    }
-
     // get the version
     const configVersion = await getClientConfigVersion(newt.newtId);
 
-    if (message.configVersion && configVersion != message.configVersion) {
+    if (message.configVersion && configVersion != null && configVersion != message.configVersion) {
         logger.warn(
             `Newt ping with outdated config version: ${message.configVersion} (current: ${configVersion})`
         );
 
+        // get the site
+        const [site] = await db
+            .select()
+            .from(sites)
+            .where(eq(sites.siteId, newt.siteId))
+            .limit(1);
+
+        if (!site) {
+            logger.warn(
+                `Newt ping message: site with ID ${newt.siteId} not found`
+            );
+            return;
+        }
+
         await sendNewtSyncMessage(newt, site);
     }