diff --git a/awx/ui/src/screens/Instances/InstanceAdd/InstanceAdd.js b/awx/ui/src/screens/Instances/InstanceAdd/InstanceAdd.js
index 1c0e86400d..e9b33e1338 100644
--- a/awx/ui/src/screens/Instances/InstanceAdd/InstanceAdd.js
+++ b/awx/ui/src/screens/Instances/InstanceAdd/InstanceAdd.js
@@ -9,6 +9,10 @@ function InstanceAdd() {
   const [formError, setFormError] = useState();
   const handleSubmit = async (values) => {
     try {
+      if (values.listener_port === undefined) {
+        values.listener_port = null;
+      }
+
       const {
         data: { id },
       } = await InstancesAPI.create(values);
diff --git a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js
index 8af796a6c5..ce086dbee4 100644
--- a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js
+++ b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { t } from '@lingui/macro';
 import { CardBody } from 'components/Card';
 import PaginatedTable, {
@@ -138,10 +138,7 @@ function InstanceEndPointList({ setBreadcrumb }) {
             isAllExpanded={isAllExpanded}
             onExpandAll={expandAll}
             qsConfig={QS_CONFIG}
-            additionalControls={
-              [
-              ]
-            }
+            additionalControls={[]}
           />
         )}
         renderRow={(endpoint, index) => (
diff --git a/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js b/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js
index ca36e725ef..60486d2d0c 100644
--- a/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js
+++ b/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js
@@ -153,7 +153,7 @@ function InstancePeerList({ setBreadcrumb }) {
           continue;
         }
 
-        if(receptor.is_internal) {
+        if (receptor.is_internal) {
           continue;
         }