diff --git a/arlas-iam-core/src/main/java/io/arlas/iam/impl/HibernateRefreshTokenDao.java b/arlas-iam-core/src/main/java/io/arlas/iam/impl/HibernateRefreshTokenDao.java
index e1621b3..cf038d0 100644
--- a/arlas-iam-core/src/main/java/io/arlas/iam/impl/HibernateRefreshTokenDao.java
+++ b/arlas-iam-core/src/main/java/io/arlas/iam/impl/HibernateRefreshTokenDao.java
@@ -31,7 +31,9 @@ public void createOrUpdate(UUID userId, RefreshToken token) {
 
     @Override
     public void delete(RefreshToken token) {
-        currentSession().remove(token);
-        currentSession().flush();
+        if (token != null && read(token.getValue()).isPresent()) {
+            currentSession().remove(token);
+            currentSession().flush();
+        }
     }
 }