diff --git a/app/src/main/java/net/typeblog/shelter/services/ShelterService.java b/app/src/main/java/net/typeblog/shelter/services/ShelterService.java
index 1957f57..d9fa83b 100644
--- a/app/src/main/java/net/typeblog/shelter/services/ShelterService.java
+++ b/app/src/main/java/net/typeblog/shelter/services/ShelterService.java
@@ -291,6 +291,16 @@ public class ShelterService extends Service {
         return mBinder;
     }
 
+    @Override
+    public boolean onUnbind(Intent intent) {
+        // Stop our foreground notification (if it was created at all) when
+        // all clients have disconnected.
+        // This helps to ensure no notification is left when the Shelter activity
+        // is closed.
+        stopForeground(true);
+        return false;
+    }
+
     private boolean isHidden(String packageName) {
         return mIsProfileOwner && mPolicyManager.isApplicationHidden(mAdminComponent, packageName);
     }