diff --git a/api/debug/serenata.cfm b/api/debug/serenata.cfm
index e33da5b..eef601b 100644
--- a/api/debug/serenata.cfm
+++ b/api/debug/serenata.cfm
@@ -14,11 +14,15 @@
   <cfabort>
 </cfif>
 
-<cfquery name="qShard" datasource="payfrit">
-  SELECT ID, UUID, IsActive
-  FROM BeaconShards
-  WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#qBiz.BeaconShardID#">
-</cfquery>
+<cfif val(qBiz.BeaconShardID) GT 0>
+  <cfquery name="qShard" datasource="payfrit">
+    SELECT ID, UUID, IsActive
+    FROM BeaconShards
+    WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#qBiz.BeaconShardID#">
+  </cfquery>
+<cfelse>
+  <cfset qShard = queryNew("ID,UUID,IsActive")>
+</cfif>
 
 <cfquery name="qSP" datasource="payfrit">
   SELECT ID, Name, BeaconMinor, IsActive