diff --git a/app/services/postgresql_query_service.rb b/app/services/postgresql_query_service.rb
index 0c8b02a70c..823505d8cc 100644
--- a/app/services/postgresql_query_service.rb
+++ b/app/services/postgresql_query_service.rb
@@ -39,7 +39,10 @@ class PostgresqlQueryService
       result = connection.exec(query_text)
 
     rescue StandardError => e
-      reset_connection(data_source) if connection&.finished?
+      if connection&.status === PG::Constants::CONNECTION_BAD
+        connection&.finish
+        reset_connection(data_source)
+      end
 
       puts e
       error = { message: e.message }