diff --git a/environment.yml b/environment.yml
index 645307d64..5e8d1eb2f 100644
--- a/environment.yml
+++ b/environment.yml
@@ -62,7 +62,6 @@ dependencies:
     - twine==4.0.2
     - delta-sharing-python>=1.0.0,<2.0.0
     - polars>=0.18.8,<1.0.0
-    - moto[s3]>=4.1.14
     - xarray>=2023.1.0,<2023.8.0
     - ecmwf-api-client>=1.6.3,<2.0.0
     - netCDF4>=1.6.4,<2.0.0
@@ -70,18 +69,19 @@ dependencies:
     - joblib==1.3.2,<2.0.0
     - great-expectations>=0.18.8,<1.0.0
     - pip:
-        - databricks-sdk>=0.20.0,<1.0.0    
-        - dependency-injector>=4.41.0,<5.0.0
-        - azure-functions>=1.15.0,<2.0.0
-        - azure-mgmt-eventgrid>=10.2.0
-        - hvac>=1.1.1
-        - langchain>=0.2.0,<0.3.0
-        - langchain-community>=0.2.0,<0.3.0
-        - build==0.10.0
-        - deltalake>=0.10.1,<1.0.0
-        - trio>=0.22.1
-        - sqlparams>=5.1.0,<6.0.0
-        - entsoe-py>=0.5.10,<1.0.0
-        - web3>=6.18.0,<7.0.0
-        - eth-typing>=4.2.3,<5.0.0
-        - pandas>=1.5.2,<2.2.0
+          - databricks-sdk>=0.20.0,<1.0.0
+          - dependency-injector>=4.41.0,<5.0.0
+          - azure-functions>=1.15.0,<2.0.0
+          - azure-mgmt-eventgrid>=10.2.0
+          - hvac>=1.1.1
+          - langchain>=0.2.0,<0.3.0
+          - langchain-community>=0.2.0,<0.3.0
+          - build==0.10.0
+          - deltalake>=0.10.1,<1.0.0
+          - trio>=0.22.1
+          - sqlparams>=5.1.0,<6.0.0
+          - entsoe-py>=0.5.10,<1.0.0
+          - web3>=6.18.0,<7.0.0
+          - eth-typing>=4.2.3,<5.0.0
+          - pandas>=1.5.2,<2.2.0
+          - moto[s3]>=5.0.16,<6.0.0
diff --git a/src/sdk/python/rtdip_sdk/queries/time_series/_time_series_query_builder.py b/src/sdk/python/rtdip_sdk/queries/time_series/_time_series_query_builder.py
index 085941859..d0d0771a0 100644
--- a/src/sdk/python/rtdip_sdk/queries/time_series/_time_series_query_builder.py
+++ b/src/sdk/python/rtdip_sdk/queries/time_series/_time_series_query_builder.py
@@ -1117,10 +1117,13 @@ def _query_builder(parameters_dict: dict, query_type: str) -> str:
             + " "
             + parameters_dict["time_interval_unit"][0]
         )
+        to_json_flag = parameters_dict.get("to_json", False)
+        parameters_dict["to_json"] = False
         sample_prepared_query, sample_query, sample_parameters = _sample_query(
             parameters_dict
         )
         sample_parameters["is_resample"] = False
+        sample_parameters["to_json"] = to_json_flag
         return _interpolation_query(parameters_dict, sample_query, sample_parameters)
 
     if query_type == "time_weighted_average":