diff --git a/pkg/querier/http.go b/pkg/querier/http.go
index 61c7ecd4af..a7e8d153b3 100644
--- a/pkg/querier/http.go
+++ b/pkg/querier/http.go
@@ -236,18 +236,19 @@ func (q *QuerierAPI) TailHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	conn, err := upgrader.Upgrade(w, r, nil)
+	tenantID, err := tenant.TenantID(r.Context())
 	if err != nil {
-		level.Error(logger).Log("msg", "Error in upgrading websocket", "err", err)
+		level.Warn(logger).Log("msg", "error getting tenant id", "err", err)
+		serverutil.WriteError(httpgrpc.Errorf(http.StatusBadRequest, err.Error()), w)
 		return
 	}
 
-	tenantID, err := tenant.TenantID(r.Context())
+	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		level.Error(logger).Log("msg", "error getting tenant id", "err", err)
-		serverutil.WriteError(httpgrpc.Errorf(http.StatusBadRequest, err.Error()), w)
+		level.Error(logger).Log("msg", "Error in upgrading websocket", "err", err)
 		return
 	}
+
 	level.Info(logger).Log("msg", "starting to tail logs", "tenant", tenantID, "selectors", req.Query)
 
 	defer func() {
diff --git a/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml b/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
index 903d91ccdb..25731808b9 100644
--- a/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
+++ b/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
@@ -8,3 +8,7 @@ datasources:
     type: loki
     access: proxy
     url: http://query-frontend:8007
+    jsonData:
+      httpHeaderName1: 'X-Scope-OrgID'
+    secureJsonData:
+      httpHeaderValue1: '1'