diff --git a/src/core/src/self_reporting/search.rs b/src/core/src/self_reporting/search.rs
index c196cdeb0e..682b73d291 100644
--- a/src/core/src/self_reporting/search.rs
+++ b/src/core/src/self_reporting/search.rs
@@ -21,6 +21,7 @@ use config::{
         search::{
             Query, Request as SearchRequest, RequestEncoding, SearchEventType, default_use_cache,
         },
+        self_reporting::usage::USAGE_STREAM,
         stream::StreamType,
     },
     utils::json,
@@ -42,6 +43,11 @@ pub async fn get_usage(
         (vec![], vec![])
     };
 
+    // return empty if usage stream is not there
+    if !infra::schema::exists(META_ORG_ID, StreamType::Logs, USAGE_STREAM).await {
+        return Ok(vec![]);
+    }
+
     let req = SearchRequest {
         query: Query {
             sql,
diff --git a/src/jobs/src/job/service_graph.rs b/src/jobs/src/job/service_graph.rs
index 6dfdd8cfb1..6fbda3c28e 100644
--- a/src/jobs/src/job/service_graph.rs
+++ b/src/jobs/src/job/service_graph.rs
@@ -41,8 +41,7 @@ pub async fn run() -> Result<(), anyhow::Error> {
                 {
                     log::error!("[SERVICE_GRAPH::JOB] Processing failed: {e}");
                 }
-            },
-            sleep_after
+            }
         );
     }