diff --git a/src/main/java/wtf/beatrice/releasehive/services/UserServiceImpl.java b/src/main/java/wtf/beatrice/releasehive/services/UserServiceImpl.java
index 0f39dbb..ae0a757 100644
--- a/src/main/java/wtf/beatrice/releasehive/services/UserServiceImpl.java
+++ b/src/main/java/wtf/beatrice/releasehive/services/UserServiceImpl.java
@@ -38,7 +38,9 @@ public class UserServiceImpl implements UserService
         if (userRepository.findById(id).isEmpty()) {
             throw new UsernameNotFoundException(id.toString());
         }
-        userRepository.delete(userRepository.findById(id).get());
+        if (userRepository.findById(id).isPresent()) {
+            userRepository.delete(userRepository.findById(id).get());
+        }
         return true;
     }
 }