diff --git a/atst/domain/portfolios/portfolios.py b/atst/domain/portfolios/portfolios.py
index 75ddf28d..2e5282e2 100644
--- a/atst/domain/portfolios/portfolios.py
+++ b/atst/domain/portfolios/portfolios.py
@@ -16,7 +16,7 @@ class PortfolioError(Exception):
 
 class Portfolios(object):
     @classmethod
-    def create(cls, user, name, defense_component):
+    def create(cls, user, name, defense_component=None):
         portfolio = PortfoliosQuery.create(
             name=name, defense_component=defense_component
         )
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index 0bf8770a..67ae683d 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -24,12 +24,16 @@
           <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Save</button>
         </div>
       </div>
-      <div class='defense-row'>
-        <div>
-          <div class='admin-title'>{{ "forms.task_order.defense_component_label" | translate }}</div>
-          <div class='admin-content'>{{ portfolio.defense_component }}</div>
+        <div class='defense-row'>
+          <div>
+            <div class='admin-title'>{{ "forms.task_order.defense_component_label" | translate }}</div>
+            {% if portfolio.defense_component %}
+              <div class='admin-content'>{{ portfolio.defense_component }}</div>
+            {% else %}
+              <div class='admin-content'>{{ "fragments.portfolio_admin.none" | translate }}</div>
+            {% endif %}
+          </div>
         </div>
-      </div>
     </form>
 
     {% include "fragments/audit_events_log.html" %}
diff --git a/translations.yaml b/translations.yaml
index 57aec61a..dc4def8f 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -6,7 +6,6 @@
   #   title: A title with <a href="#">a link</a>!
 
   # `{{ "login.title" | translate | safe }}`
-
 audit_log:
   events:
     default:
@@ -298,6 +297,8 @@ fragments:
     bullet_1: Make sure the information below matches the final task order and is accurate and up-to-date
     bullet_2: Upload your Task Order (TO) document
     bullet_3: Add both the Task Order (TO) and Line(s) of Accounting (LOA) numbers
+  portfolio_admin:
+    none: Not Selected
 login:
   ccpo_logo_alt_text: Cloud Computing Program Office Logo
   certificate_selection: