diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/construction/SerializablePipelineOptions.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/construction/SerializablePipelineOptions.java
index e2a1257cbaa6..9cc7eef4530f 100644
--- a/runners/core-java/src/main/java/org/apache/beam/runners/core/construction/SerializablePipelineOptions.java
+++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/construction/SerializablePipelineOptions.java
@@ -43,13 +43,13 @@ public class SerializablePipelineOptions implements Serializable {
   public SerializablePipelineOptions(PipelineOptions options) {
     this.serializedPipelineOptions = serializeToJson(options);
     this.options = options;
-    FileSystems.setDefaultPipelineOptions(options);
+    FileSystems.registerFileSystemsOnce(options);
   }
 
   public SerializablePipelineOptions(String json) {
     this.serializedPipelineOptions = json;
     this.options = deserializeFromJson(json);
-    FileSystems.setDefaultPipelineOptions(options);
+    FileSystems.registerFileSystemsOnce(options);
   }
 
   public PipelineOptions get() {