diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
index 37a9717ade..3b99da9e73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
@@ -178,9 +178,13 @@ public final class GenericForegroundService extends Service {
     } else {
       try {
         ContextCompat.startForegroundService(context, intent);
-      } catch (ForegroundServiceStartNotAllowedException e) {
-        Log.e(TAG, "Unable to start foreground service", e);
-        throw new UnableToStartException(e);
+      } catch (IllegalStateException e) {
+        if (e instanceof ForegroundServiceStartNotAllowedException) {
+          Log.e(TAG, "Unable to start foreground service", e);
+          throw new UnableToStartException(e);
+        } else {
+          throw e;
+        }
       }
     }