diff --git a/src/cljs/auto_ap/effects.cljs b/src/cljs/auto_ap/effects.cljs
index fa06af1c..6b477e18 100644
--- a/src/cljs/auto_ap/effects.cljs
+++ b/src/cljs/auto_ap/effects.cljs
@@ -16,6 +16,13 @@
    [re-frame.core :as re-frame]
    [venia.core :as v]))
 
+(defn maybe-add-x-clients [headers]
+  (if (or (and (sequential? (:selected-clients @re-frame.db/app-db)) (every? int? (:selected-clients @re-frame.db/app-db)))
+          (and (sequential? (:selected-clients @re-frame.db/app-db)) (every? string? (:selected-clients @re-frame.db/app-db)))
+          (keyword? (:selected-clients @re-frame.db/app-db)))
+    (assoc headers "x-clients" (pr-str (:selected-clients @re-frame.db/app-db)))
+    headers))
+
 (re-frame/reg-fx
  :redirect
  (fn [uri]
@@ -85,7 +92,7 @@
      (let [headers (if token
                      (assoc headers "Authorization" (str "Token " token))
                      headers)
-           headers (assoc headers "x-clients" (pr-str (:selected-clients @re-frame.db/app-db)))
+           headers (maybe-add-x-clients headers)
            response (<! (http/request {:method method
                                        :body body
                                        :headers  headers
@@ -154,6 +161,8 @@
                          time))))
 
 
+
+
 (re-frame/reg-fx
  :graphql
  (fn [{:keys [query on-success on-error token variables query-obj owns-state db]}]
@@ -166,7 +175,7 @@
      (let [headers (if token
                      {"Authorization" (str "Token " token)} 
                      {})
-           headers (assoc headers "x-clients" (pr-str (:selected-clients @re-frame.db/app-db)))
+           headers (maybe-add-x-clients headers)
            on-success (if (fn? on-success)
                         on-success
                         (fn [result]