diff --git a/src/registrar/migrations/0023_alter_domainapplication_address_line2.py b/src/registrar/migrations/0023_alter_domainapplication_address_line2.py
new file mode 100644
index 000000000..1db1b4361
--- /dev/null
+++ b/src/registrar/migrations/0023_alter_domainapplication_address_line2.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.1.6 on 2023-05-31 17:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0022_draftdomain_domainapplication_approved_domain_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="address_line2",
+            field=models.TextField(
+                blank=True, help_text="Street address line 2", null=True
+            ),
+        ),
+    ]
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 3859e04a7..fa3a2973c 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -343,8 +343,7 @@ class DomainApplication(TimeStampedModel):
         blank=True,
         help_text="Street address",
     )
-    address_line2 = models.CharField(
-        max_length=15,
+    address_line2 = models.TextField(
         null=True,
         blank=True,
         help_text="Street address line 2",
@@ -562,11 +561,13 @@ class DomainApplication(TimeStampedModel):
         """Show this step if the answer to the first question implies it.
 
         This shows for answers that aren't "Federal" or "Interstate".
+        This also doesnt show if user selected "School District" as well (#524)
         """
         user_choice = self.organization_type
         excluded = [
             DomainApplication.OrganizationChoices.FEDERAL,
             DomainApplication.OrganizationChoices.INTERSTATE,
+            DomainApplication.OrganizationChoices.SCHOOL_DISTRICT,
         ]
         return bool(user_choice and user_choice not in excluded)