diff --git a/db/migrate/20190918105234_remove_all_master_variants_from_exchanges.rb b/db/migrate/20190918105234_remove_all_master_variants_from_exchanges.rb
new file mode 100644
index 0000000000..1b6de20c30
--- /dev/null
+++ b/db/migrate/20190918105234_remove_all_master_variants_from_exchanges.rb
@@ -0,0 +1,53 @@
+class RemoveAllMasterVariantsFromExchanges < ActiveRecord::Migration
+  def up
+    # 1. We add standard variants of the products of "lonely masters" into the Exchanges where the master variants are lonely
+    match_master_variants
+
+    # 2. We delete all master variants from Exchanges
+    delete_master_variants
+  end
+
+  def down
+  end
+
+  private
+
+  def match_master_variants
+    # Master variants that are distributed in Exchanges and their product doesnt have any other variant in those Exchanges
+    lonely_masters_sql = "
+      SELECT e.id exchange_id, v.id master_variant_id
+      FROM exchanges e
+      JOIN exchange_variants ev ON (e.id = ev.exchange_id)
+      JOIN spree_variants v ON (ev.variant_id = v.id)
+      WHERE v.is_master = true
+      AND not exists (SELECT 1
+                      FROM exchanges e_std
+                      JOIN exchange_variants ev_std ON (e_std.id = ev_std.exchange_id)
+                      JOIN spree_variants v_std ON (ev_std.variant_id = v_std.id)
+                      WHERE v_std.is_master = false AND e.order_cycle_id = e_std.order_cycle_id)"
+
+    # List of all Master Variant IDs with respective max (latest) Standard Variant ID
+    latest_standard_variants_sql = "
+      SELECT v_master.id master_variant_id, max(v.id) standard_variant_id
+      FROM spree_variants v
+      JOIN spree_variants v_master ON (v.product_id = v_master.product_id and v_master.is_master = true)
+      WHERE v.is_master = false
+      GROUP BY v_master.id"
+
+    # Insert latest standard variant of each lonely_master into the Exchanges where the lonely_masters are
+    execute(
+      "INSERT INTO exchange_variants (exchange_id, variant_id, created_at, updated_at)
+      SELECT lonely_masters.exchange_id, latest_standard_variants.standard_variant_id, now(), now()
+      FROM (#{lonely_masters_sql}) lonely_masters
+      JOIN (#{latest_standard_variants_sql}) latest_standard_variants on (lonely_masters.master_variant_id = latest_standard_variants.master_variant_id)" )
+  end
+
+  def delete_master_variants
+    execute("
+      DELETE
+      FROM exchange_variants ev
+      USING spree_variants v
+      WHERE ev.variant_id = v.id
+        AND v.is_master = true")
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 99f98e7c59..8530440f6e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20190916110029) do
+ActiveRecord::Schema.define(:version => 20190918105234) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"