diff --git a/langfuse/_client/resource_manager.py b/langfuse/_client/resource_manager.py
index aa9c7ce89..08c008234 100644
--- a/langfuse/_client/resource_manager.py
+++ b/langfuse/_client/resource_manager.py
@@ -415,11 +415,7 @@ def shutdown(self) -> None:
         # Unregister the atexit handler first
         atexit.unregister(self.shutdown)
 
-        if self.tracer_provider is not None and not isinstance(
-            self.tracer_provider, otel_trace_api.ProxyTracerProvider
-        ):
-            self.tracer_provider.force_flush()
-
+        self.flush()
         self._stop_and_join_consumer_threads()
 
 
diff --git a/tests/test_datasets.py b/tests/test_datasets.py
index c3ad7a318..c1b81868d 100644
--- a/tests/test_datasets.py
+++ b/tests/test_datasets.py
@@ -50,6 +50,7 @@ def test_create_dataset_item():
         source_trace_id=generation.trace_id,
     )
     langfuse.create_dataset_item(
+        input="Hello",
         dataset_name=name,
     )
 
@@ -67,7 +68,7 @@ def test_create_dataset_item():
     assert dataset.items[1].source_trace_id == generation.trace_id
     assert dataset.items[1].dataset_name == name
 
-    assert dataset.items[0].input is None
+    assert dataset.items[0].input == "Hello"
     assert dataset.items[0].expected_output is None
     assert dataset.items[0].metadata is None
     assert dataset.items[0].source_observation_id is None