diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
index 5851a1af04..f3f4300fc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
@@ -4,7 +4,10 @@ import android.app.Application;
 import android.app.job.JobInfo;
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -45,9 +48,15 @@ public class NetworkConstraint implements Constraint {
 
   public static boolean isMet(@NonNull Context context) {
     ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    NetworkInfo         activeNetworkInfo   = connectivityManager.getActiveNetworkInfo();
 
-    return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    if (Build.VERSION.SDK_INT >= 23) {
+      Network             activeNetwork       = connectivityManager.getActiveNetwork();
+      NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork);
+      return networkCapabilities != null && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+    } else {
+      NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+      return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    }
   }
 
   public static final class Factory implements Constraint.Factory<NetworkConstraint> {