diff --git a/sf_daq_broker/config.py b/sf_daq_broker/config.py
index 25d7115..45c5151 100644
--- a/sf_daq_broker/config.py
+++ b/sf_daq_broker/config.py
@@ -10,8 +10,9 @@ AUDIT_FILE_TIME_FORMAT = "%Y%m%d-%H%M%S"
 
 DEFAULT_AUDIT_FILENAME = "/var/log/sf_databuffer_audit.log"
 
-#DATA_API_QUERY_ADDRESS = "http://sf-data-api-02.psi.ch/query"
-DATA_API_QUERY_ADDRESS = "https://data-api.psi.ch/sf/query"
+# data_api and /matching query request. If sf-data-api-02 doesn't work (broke several times), switch to official one data-api.psi.ch
+DATA_API_QUERY_ADDRESS = "http://sf-data-api-02.psi.ch/query"
+#DATA_API_QUERY_ADDRESS = "https://data-api.psi.ch/sf/query"
 IMAGE_API_QUERY_ADDRESS = ["http://172.27.0.14:8080/api/v1/query", "http://172.27.0.15:8080/api/v1/query"]
 DATA_API3_QUERY_ADDRESS = "http://sf-daqbuf-33:8371/api/1"
 EPICS_QUERY_ADDRESS = "https://data-api.psi.ch/sf"