diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index 97a1bbae..4a16b6ba 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -23,11 +23,11 @@ allOpen {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode = 10000500
         versionName = "1.0.5"
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
index 27e83e62..6c6784f1 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
@@ -71,16 +71,21 @@ public class HttpClient {
                 SSLContext sslContext;
 
                 try {
-                    sslContext = SSLContext.getInstance("TLSv1.2");
-                } catch (NoSuchAlgorithmException tlsv12Exception) {
+                    sslContext = SSLContext.getInstance("TLSv1.3");
+                } catch (NoSuchAlgorithmException tlsv13Exception) {
                     try {
-                        Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
-                        sslContext = SSLContext.getInstance("TLSv1.1");
-                    } catch (NoSuchAlgorithmException tlsv11Exception) {
-                        Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
-                        sslContext = SSLContext.getInstance("TLSv1");
-                        // should be available in any device; see reference of supported protocols in
-                        // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+                        Timber.w("TLSv1.3 is not supported in this device; falling through TLSv1.2");
+                        sslContext = SSLContext.getInstance("TLSv1.2");
+                    } catch (NoSuchAlgorithmException tlsv12Exception) {
+                        try {
+                            Timber.w("TLSv1.2 is not supported in this device; falling through TLSv1.1");
+                            sslContext = SSLContext.getInstance("TLSv1.1");
+                        } catch (NoSuchAlgorithmException tlsv11Exception) {
+                            Timber.w("TLSv1.1 is not supported in this device; falling through TLSv1.0");
+                            sslContext = SSLContext.getInstance("TLSv1");
+                            // should be available in any device; see reference of supported protocols in
+                            // http://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+                        }
                     }
                 }
 
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/TLSSocketFactory.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/TLSSocketFactory.java
index 5cff6b43..25ce9ad9 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/TLSSocketFactory.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/TLSSocketFactory.java
@@ -74,8 +74,8 @@ public class TLSSocketFactory extends SSLSocketFactory {
     }
 
     private Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
+        if((socket instanceof SSLSocket)) {
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2", "TLSv1.3"});
         }
         return socket;
     }
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 4d0c1d4b..d3112b7a 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -5,11 +5,11 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         // This is pretty ugly but manifest placeholders don't seem to work very well when using different modules
         // See https://github.com/openid/AppAuth-Android/issues/325