@@ -489,7 +489,7 @@ def apply_saved_dataset(
         request = RegistryServer_pb2.ApplySavedDatasetRequest(
             saved_dataset=saved_dataset.to_proto(), project=project, commit=commit
         )
-        self.stub.ApplyFeatureService(request)
+        self.stub.ApplySavedDataset(request)
 
     def delete_saved_dataset(self, name: str, project: str, commit: bool = True):
         request = RegistryServer_pb2.DeleteSavedDatasetRequest(
 
@@ -18,8 +18,10 @@
 import pytest
 from google.protobuf.timestamp_pb2 import Timestamp
 
+from feast.infra.offline_stores.file_source import SavedDatasetFileStorage
 from feast.infra.registry.remote import RemoteRegistry
 from feast.protos.feast.registry import RegistryServer_pb2
+from feast.saved_dataset import SavedDataset
 
 
 @pytest.fixture
@@ -83,3 +85,29 @@ def test_updated_since_none(remote_registry):
         remote_registry.stub.ListAllFeatureViews.call_args[0][0]
     )
     assert not request.HasField("updated_since")
+
+
+def test_apply_saved_dataset_calls_apply_saved_dataset_rpc(remote_registry):
+    """apply_saved_dataset() must invoke the ApplySavedDataset RPC, not
+    ApplyFeatureService -- calling the wrong RPC means the server tries to
+    deserialize an ApplySavedDatasetRequest as an ApplyFeatureServiceRequest,
+    which the server cannot handle correctly."""
+    saved_dataset = SavedDataset(
+        name="test_saved_dataset",
+        features=["feature_view:feature"],
+        join_keys=["entity_id"],
+        storage=SavedDatasetFileStorage(path="/tmp/does-not-need-to-exist.parquet"),
+        tags={},
+    )
+
+    remote_registry.apply_saved_dataset(saved_dataset, "project", commit=True)
+
+    remote_registry.stub.ApplySavedDataset.assert_called_once()
+    remote_registry.stub.ApplyFeatureService.assert_not_called()
+
+    request: RegistryServer_pb2.ApplySavedDatasetRequest = (
+        remote_registry.stub.ApplySavedDataset.call_args[0][0]
+    )
+    assert request.saved_dataset.spec.name == "test_saved_dataset"
+    assert request.project == "project"
+    assert request.commit is True
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ def apply_saved_dataset(`
`489`	`489`	`request = RegistryServer_pb2.ApplySavedDatasetRequest(`
`490`	`490`	`saved_dataset=saved_dataset.to_proto(), project=project, commit=commit`
`491`	`491`	`)`
`492`		`- self.stub.ApplyFeatureService(request)`
	`492`	`+ self.stub.ApplySavedDataset(request)`
`493`	`493`
`494`	`494`	`def delete_saved_dataset(self, name: str, project: str, commit: bool = True):`
`495`	`495`	`request = RegistryServer_pb2.DeleteSavedDatasetRequest(`