diff --git a/src/documents/migrations/0021_document_storage_type.py b/src/documents/migrations/0021_document_storage_type.py
index 52187ea9b..cec172b93 100644
--- a/src/documents/migrations/0021_document_storage_type.py
+++ b/src/documents/migrations/0021_document_storage_type.py
@@ -12,9 +12,19 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+
+        # Add the field with the default GPG-encrypted value
         migrations.AddField(
             model_name='document',
             name='storage_type',
             field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='gpg', editable=False, max_length=11),
         ),
+
+        # Now that the field is added, change the default to unencrypted
+        migrations.AlterField(
+            model_name='document',
+            name='storage_type',
+            field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11),
+        ),
+
     ]
diff --git a/src/documents/migrations/0022_auto_20180527_1653.py b/src/documents/migrations/0022_auto_20180527_1653.py
deleted file mode 100644
index 2d382da7b..000000000
--- a/src/documents/migrations/0022_auto_20180527_1653.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-27 16:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('documents', '0021_document_storage_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='document',
-            name='storage_type',
-            field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11),
-        ),
-    ]