diff --git a/src/main/java/org/ohdsi/webapi/service/converters/SourceRequestToSourceConverter.java b/src/main/java/org/ohdsi/webapi/service/converters/SourceRequestToSourceConverter.java
index 5d243e6b82..3dafe0a68e 100644
--- a/src/main/java/org/ohdsi/webapi/service/converters/SourceRequestToSourceConverter.java
+++ b/src/main/java/org/ohdsi/webapi/service/converters/SourceRequestToSourceConverter.java
@@ -29,6 +29,9 @@ public Source convert(SourceRequest request) {
         source.setKeyfileName(request.getKeyfileName());
         source.setKrbAdminServer(request.getKrbAdminServer());
         source.setKrbAuthMethod(KerberosAuthMechanism.getByName(request.getKrbAuthMethod()));
+        if (request.isCheckConnection() != null) {
+            source.setCheckConnection(request.isCheckConnection());
+        }
         return source;
     }
 }
diff --git a/src/main/java/org/ohdsi/webapi/source/Source.java b/src/main/java/org/ohdsi/webapi/source/Source.java
index c6f7820285..3b326a763c 100644
--- a/src/main/java/org/ohdsi/webapi/source/Source.java
+++ b/src/main/java/org/ohdsi/webapi/source/Source.java
@@ -114,7 +114,7 @@ public class Source extends CommonEntity<Integer> implements Serializable {
   private boolean isCacheEnabled;
 
   @Column(name = "check_connection")
-  private boolean checkConnection;
+  private boolean checkConnection = true;
 
 
   public String getTableQualifier(DaimonType daimonType) {
diff --git a/src/main/java/org/ohdsi/webapi/source/SourceController.java b/src/main/java/org/ohdsi/webapi/source/SourceController.java
index 435c7b840a..ee32d2f4de 100644
--- a/src/main/java/org/ohdsi/webapi/source/SourceController.java
+++ b/src/main/java/org/ohdsi/webapi/source/SourceController.java
@@ -238,6 +238,9 @@ public SourceInfo updateSource(@PathParam("sourceId") Integer sourceId, @FormDat
       }
       setKeyfileData(updated, source, file);
       transformIfRequired(updated);
+      if (request.isCheckConnection() == null) {
+        updated.setCheckConnection(source.isCheckConnection());
+      }
       updated.setModifiedBy(getCurrentUser());
       updated.setModifiedDate(new Date());
 
diff --git a/src/main/java/org/ohdsi/webapi/source/SourceRequest.java b/src/main/java/org/ohdsi/webapi/source/SourceRequest.java
index a81838f081..c8cd42e8fc 100644
--- a/src/main/java/org/ohdsi/webapi/source/SourceRequest.java
+++ b/src/main/java/org/ohdsi/webapi/source/SourceRequest.java
@@ -19,6 +19,7 @@ public class SourceRequest {
     private String krbAdminServer;
     private Collection<SourceDaimon> daimons;
     private String keyfileName;
+    private Boolean checkConnection;
 
     public String getName() {
 
@@ -111,4 +112,12 @@ public void setKeyfileName(String keyfileName) {
 
         this.keyfileName = keyfileName;
     }
+
+    public Boolean isCheckConnection() {
+        return checkConnection;
+    }
+
+    public void setCheckConnection(Boolean checkConnection) {
+        this.checkConnection = checkConnection;
+    }
 }