diff --git a/netbox/extras/models.py b/netbox/extras/models.py
index bf9a445cd..b82fbb812 100644
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -616,13 +616,16 @@ class ImageAttachment(models.Model):
         """
         from django.conf import settings
         if settings.MEDIA_STORAGE and settings.MEDIA_STORAGE['BACKEND'] == 'S3':
-            from botocore.exceptions import ClientError as AccessError
-        else:
-            AccessError = OSError
+            # For S3 we need to handle a different exception
+            from botocore.exceptions import ClientError
+            try:
+                return self.image.size
+            except ClientError:
+                return None
 
         try:
             return self.image.size
-        except AccessError:
+        except OSError:
             return None