diff --git a/src/avram/database.cr b/src/avram/database.cr
index d8e85b7e8..c843b26ea 100644
--- a/src/avram/database.cr
+++ b/src/avram/database.cr
@@ -187,15 +187,18 @@ abstract class Avram::Database
   # once the block is finished
   private def with_connection(&)
     key = object_id
-    connections[key] ||= db.checkout
-    connection = connections[key]
-
-    begin
-      yield connection
-    ensure
-      if !connection._avram_in_transaction?
-        connection.release
-        connections.delete(key)
+
+    db.retry do
+      connections[key] ||= db.checkout
+      connection = connections[key]
+
+      begin
+        yield connection
+      ensure
+        if !connection._avram_in_transaction?
+          connection.release
+          connections.delete(key)
+        end
       end
     end
   end