diff --git a/Gemfile.lock b/Gemfile.lock
index 274e758..937d40b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_easy_replicate (0.3.6)
+    pg_easy_replicate (0.3.7)
       ougai (~> 2.0.0)
       pg (~> 1.5.3)
       pg_query (~> 5.1.0)
diff --git a/lib/pg_easy_replicate.rb b/lib/pg_easy_replicate.rb
index a90e742..e681912 100644
--- a/lib/pg_easy_replicate.rb
+++ b/lib/pg_easy_replicate.rb
@@ -169,6 +169,11 @@ def cleanup(options)
           logger.info("Dropping groups table")
           Group.drop
         end,
+        -> do
+          if options[:restore_connection_on_source_db]
+            restore_connections_on_source_db
+          end
+        end,
         -> do
           if options[:everything]
             logger.info("Dropping schema")
@@ -213,11 +218,6 @@ def cleanup(options)
             end
           end
         end,
-        -> do
-          if options[:restore_connection_on_source_db]
-            restore_connections_on_source_db
-          end
-        end,
       ]
 
       cleanup_steps.each do |step|
diff --git a/lib/pg_easy_replicate/version.rb b/lib/pg_easy_replicate/version.rb
index d01d29e..38b2600 100644
--- a/lib/pg_easy_replicate/version.rb
+++ b/lib/pg_easy_replicate/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEasyReplicate
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end