diff --git a/achievements.py b/achievements.py
index a6be9bf..6356c7b 100644
--- a/achievements.py
+++ b/achievements.py
@@ -36,5 +36,11 @@ def unendorse_achievement(id):
         return "Can't unendorse if you never endorsed..."
     achievement.endorsed_by.remove(current_user)
     db.session.add(achievement)
-    db.session.commit()
-    return redirect(url_for("get_achievement", id=id))
\ No newline at end of file
+    if len(achievement.endorsed_by) == 0:
+        db.session.delete(achievement)
+        db.session.commit()
+        return redirect(url_for("all_users"))
+    else:
+        db.session.commit()
+        return redirect(url_for("get_achievement", id=id))
+