diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj
index 0ff22732..cfc297ad 100644
--- a/src/clj/auto_ap/square/core.clj
+++ b/src/clj/auto_ap/square/core.clj
@@ -452,7 +452,8 @@
    (map (fn [x] [:db/retractEntity x]))))
 
 (defn upsert-all []
-  (doseq [[client-code] (get-in env [:square-config])]
+  (doseq [[client-code] (get-in env [:square-config])
+          :when (d/entid (d/db conn) [:client/code client-code])]
     (lc/with-context {:source (str "Square loading for " client-code)
                       :client client-code}
       (log/info "Loading Orders")