diff --git a/app/models/packages.py b/app/models/packages.py
index 2421f5a3..c6e40726 100644
--- a/app/models/packages.py
+++ b/app/models/packages.py
@@ -444,6 +444,9 @@ class Package(db.Model):
 			"downloads": self.downloads
 		}
 
+	def getThumbnailOrPlaceholder(self, level=2):
+		return self.getThumbnailURL(level) or "/static/placeholder.png"
+
 	def getThumbnailURL(self, level=2):
 		screenshot = self.screenshots.filter_by(approved=True).order_by(db.asc(PackageScreenshot.id)).first()
 		return screenshot.getThumbnailURL(level) if screenshot is not None else None
diff --git a/app/templates/macros/audit_log.html b/app/templates/macros/audit_log.html
index 6e895758..77008161 100644
--- a/app/templates/macros/audit_log.html
+++ b/app/templates/macros/audit_log.html
@@ -50,7 +50,7 @@
 							<img
 								class="img-fluid"
 								style="max-height: 22px; max-width: 22px;"
-								src="{{ entry.package.getThumbnailURL(1) }}" />
+								src="{{ entry.package.getThumbnailOrPlaceholder() }}" />
 						</div>
 					{% endif %}
 
diff --git a/app/templates/macros/packagegridtile.html b/app/templates/macros/packagegridtile.html
index 3f9d3643..725f8ccb 100644
--- a/app/templates/macros/packagegridtile.html
+++ b/app/templates/macros/packagegridtile.html
@@ -1,6 +1,6 @@
 {% macro render_pkgtile(package, show_author) -%}
 	<li class="packagetile flex-fill"><a href="{{ package.getDetailsURL() }}"
-		style="background-image: url({{ package.getThumbnailURL() or '/static/placeholder.png' }});">
+		style="background-image: url({{ package.getThumbnailOrPlaceholder(2) }});">
 		<div class="packagegridscrub"></div>
 		<div class="packagegridinfo">
 			<h3>
diff --git a/app/templates/macros/threads.html b/app/templates/macros/threads.html
index 70d63cf9..08e09712 100644
--- a/app/templates/macros/threads.html
+++ b/app/templates/macros/threads.html
@@ -186,7 +186,7 @@
 						<img
 							class="img-fluid"
 							style="max-height: 22px; max-width: 22px;"
-							src="{{ t.package.getThumbnailURL(1) }}" /><br />
+							src="{{ t.package.getThumbnailOrPlaceholder() }}" /><br />
 
 						<span class="pl-2">
 							{{ t.package.title }}
diff --git a/app/templates/macros/todo.html b/app/templates/macros/todo.html
index 8e432bd4..02676d9c 100644
--- a/app/templates/macros/todo.html
+++ b/app/templates/macros/todo.html
@@ -8,7 +8,7 @@
 						<img
 							class="img-fluid"
 							style="max-height: 22px; max-width: 22px;"
-							src="{{ package.getThumbnailURL(1) }}" />
+							src="{{ package.getThumbnailOrPlaceholder() }}" />
 
 						<span class="pl-2">
 							{{ package.title }}
diff --git a/app/templates/notifications/list.html b/app/templates/notifications/list.html
index d2f54901..38c3b9b8 100644
--- a/app/templates/notifications/list.html
+++ b/app/templates/notifications/list.html
@@ -37,7 +37,7 @@ Notifications
 							<img
 								class="img-fluid"
 								style="max-height: 22px; max-width: 22px;"
-								src="{{ n.package.getThumbnailURL(1) }}" />
+								src="{{ n.package.getThumbnailOrPlaceholder() }}" />
 
 							<span class="pl-2">
 								{{ n.package.title }}
@@ -75,7 +75,7 @@ Notifications
 								<img
 									class="img-fluid"
 									style="max-height: 22px; max-width: 22px;"
-									src="{{ n.package.getThumbnailURL(1) }}" />
+									src="{{ n.package.getThumbnailOrPlaceholder() }}" />
 
 								<span class="pl-2">
 									{{ n.package.title }}
diff --git a/app/templates/todo/editor.html b/app/templates/todo/editor.html
index 18872801..5924c5e7 100644
--- a/app/templates/todo/editor.html
+++ b/app/templates/todo/editor.html
@@ -18,7 +18,7 @@
 			<ul class="card-body d-flex p-0 flex-row flex-wrap justify-content-start align-content-start p-4">
 				{% for s in screenshots %}
 					<li class="packagetile flex-fill"><a href="{{ s.getEditURL() }}"
-						style="background-image: url({{ s.getThumbnailURL(3) or '/static/placeholder.png' }});">
+						style="background-image: url({{ s.getThumbnailOrPlaceholder(3) }});">
 						<div class="packagegridscrub"></div>
 						<div class="packagegridinfo">
 							<h3>
diff --git a/app/templates/todo/user.html b/app/templates/todo/user.html
index 25921280..5ba56fe5 100644
--- a/app/templates/todo/user.html
+++ b/app/templates/todo/user.html
@@ -15,7 +15,7 @@
 							<img
 								class="img-fluid"
 								style="max-height: 22px; max-width: 22px;"
-								src="{{ package.getThumbnailURL(1) }}" />
+								src="{{ package.getThumbnailOrPlaceholder() }}" />
 
 							<span class="pl-2">
 								{{ package.title }}