diff --git a/backend/src/app/rpc/commands/teams.clj b/backend/src/app/rpc/commands/teams.clj
index 92f0a2b2f..3215c2d50 100644
--- a/backend/src/app/rpc/commands/teams.clj
+++ b/backend/src/app/rpc/commands/teams.clj
@@ -82,9 +82,8 @@
 
 (defn decode-row
   [{:keys [features] :as row}]
-  (when row
-    (cond-> row
-      features (assoc :features (db/decode-pgarray features #{})))))
+  (cond-> row
+    (some? features) (assoc :features (db/decode-pgarray features #{}))))
 
 ;; --- Query: Teams
 
@@ -187,7 +186,6 @@
     (when-not result
       (ex/raise :type :not-found
                 :code :team-does-not-exist))
-
     (-> result
         (decode-row)
         (process-permissions))))