diff --git a/Koha/Database.pm b/Koha/Database.pm
index 6d8a1e2556..55baf80537 100644
--- a/Koha/Database.pm
+++ b/Koha/Database.pm
@@ -103,7 +103,7 @@ sub _new_schema {
             %encoding_attr,
             RaiseError => $RaiseError,
             PrintError => 1,
-            unsafe => 1,
+            unsafe => !$RaiseError,
             quote_names => 1,
             on_connect_do => [
                 $encoding_query || (),