diff --git a/changes/16562-sql-deadlock copy b/changes/16562-sql-deadlock copy
new file mode 100644
index 0000000000..c4c725e435
--- /dev/null
+++ b/changes/16562-sql-deadlock copy	
@@ -0,0 +1 @@
+Reduced the number of 'Deadlock found' errors seen by the server when multiple hosts share the same UUID
diff --git a/changes/18084-hdp-empty-state-padding b/changes/18084-hdp-empty-state-padding
new file mode 100644
index 0000000000..59c7ceb95c
--- /dev/null
+++ b/changes/18084-hdp-empty-state-padding
@@ -0,0 +1 @@
+- UI fix: padding around empty states of host details page
diff --git a/frontend/pages/hosts/details/_styles.scss b/frontend/pages/hosts/details/_styles.scss
index 49c80a82b3..e3f17951b7 100644
--- a/frontend/pages/hosts/details/_styles.scss
+++ b/frontend/pages/hosts/details/_styles.scss
@@ -186,7 +186,7 @@
 
   .empty-table {
     &__container {
-      margin: 0 0 $pad-xxlarge 0;
+      margin: $pad-xxlarge 0; // Equal padding above and below empty states
       min-height: initial;
     }
   }