diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py
index fa27aaf1b..5cce88481 100644
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -125,21 +125,18 @@ class ASN(PrimaryModel):
         verbose_name_plural = 'ASNs'
 
     def __str__(self):
-        if self.asn > 65535:
-            return 'AS{} ({}.{})'.format(self.asn, self.asn // 65536, self.asn % 65536)
-        else:
-            return f'AS{self.asn}'
+        return f'AS{self.asn_with_asdot}'
 
     def get_absolute_url(self):
         return reverse('ipam:asn', args=[self.pk])
 
     @property
-    def asdot_notation(self):
-        # Return asdot notation for an ASN larger than 65535
+    def asn_with_asdot(self):
+        # Return asn with asdot notation for an ASN larger than 65535 otherwise return the plain ASN
         if self.asn > 65535:
-            return '{}.{}'.format(self.asn // 65536, self.asn % 65536)
+            return f'{self.asn} ({self.asn // 65536}.{self.asn % 65536})'
         else:
-            return None
+            return self.asn
 
 
 @extras_features('custom_fields', 'custom_links', 'export_templates', 'tags', 'webhooks')
diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 988c89aa2..8efb1caf3 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -108,10 +108,7 @@ class ASNTable(BaseTable):
     )
 
     def render_asn(self, value, record):
-        if record.asdot_notation:
-            return f'{value} ({record.asdot_notation})'
-        else:
-            return value
+        return record.asn_with_asdot
 
     site_count = LinkedCountColumn(
         viewname='dcim:site_list',
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html
index 85eaf8122..4a1ecda0d 100644
--- a/netbox/templates/ipam/asn.html
+++ b/netbox/templates/ipam/asn.html
@@ -18,7 +18,7 @@
           <table class="table table-hover attr-table">
             <tr>
               <td>AS Number</td>
-              <td>{{ object.asn }} {% if object.asdot_notation %}({{ object.asdot_notation }}){% endif %}</td>
+              <td>{{ object.asn_with_asdot }}</td>
             </tr>
             <tr>
               <td>RIR</td>