diff --git a/components/lib/autocomplete/style/AutoCompleteStyle.js b/components/lib/autocomplete/style/AutoCompleteStyle.js
index 0e7635588..9f6348dfa 100644
--- a/components/lib/autocomplete/style/AutoCompleteStyle.js
+++ b/components/lib/autocomplete/style/AutoCompleteStyle.js
@@ -214,6 +214,10 @@ const theme = ({ dt }) => `
     color: ${dt('autocomplete.placeholder.color')};
 }
 
+.p-autocomplete-empty-message {
+    padding: ${dt('autocomplete.empty.message.padding')};
+}
+
 .p-fluid .p-autocomplete {
     display: flex;
 }
diff --git a/components/lib/listbox/style/ListboxStyle.js b/components/lib/listbox/style/ListboxStyle.js
index d010fa583..600a7e285 100644
--- a/components/lib/listbox/style/ListboxStyle.js
+++ b/components/lib/listbox/style/ListboxStyle.js
@@ -94,7 +94,7 @@ const theme = ({ dt }) => `
 }
 
 .p-listbox-empty-message {
-    padding: ${dt('listbox.option.padding')};
+    padding: ${dt('listbox.empty.message.padding')};
 }
 `;
 
diff --git a/components/lib/multiselect/style/MultiSelectStyle.js b/components/lib/multiselect/style/MultiSelectStyle.js
index 3be8996d9..f8e648c50 100644
--- a/components/lib/multiselect/style/MultiSelectStyle.js
+++ b/components/lib/multiselect/style/MultiSelectStyle.js
@@ -174,8 +174,7 @@ const theme = ({ dt }) => `
 }
 
 .p-multiselect-empty-message {
-    padding: ${dt('multiselect.option.padding')};
-    background: transparent;
+    padding: ${dt('multiselect.empty.message.padding')};
 }
 
 .p-multiselect-label .p-chip {
diff --git a/components/lib/select/style/SelectStyle.js b/components/lib/select/style/SelectStyle.js
index 2d9841811..6594bc6af 100644
--- a/components/lib/select/style/SelectStyle.js
+++ b/components/lib/select/style/SelectStyle.js
@@ -183,8 +183,7 @@ input.p-select-label {
 }
 
 .p-select-empty-message {
-    padding: ${dt('select.option.padding')};
-    background: transparent;
+    padding: ${dt('select.empty.message.padding')};
 }
 
 .p-fluid .p-select {
diff --git a/components/lib/themes/aura/autocomplete/index.js b/components/lib/themes/aura/autocomplete/index.js
index b729caae1..0c0abe2fb 100644
--- a/components/lib/themes/aura/autocomplete/index.js
+++ b/components/lib/themes/aura/autocomplete/index.js
@@ -65,5 +65,8 @@ export default {
     },
     chip: {
         borderRadius: '{border.radius.sm}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/aura/listbox/index.js b/components/lib/themes/aura/listbox/index.js
index b8b5c4e3e..a3d2512f8 100644
--- a/components/lib/themes/aura/listbox/index.js
+++ b/components/lib/themes/aura/listbox/index.js
@@ -41,5 +41,8 @@ export default {
         color: '{list.option.group.color}',
         fontWeight: '{list.option.group.font.weight}',
         padding: '{list.option.group.padding}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/aura/multiselect/index.js b/components/lib/themes/aura/multiselect/index.js
index 06bafe6a4..1a9f8fa5e 100644
--- a/components/lib/themes/aura/multiselect/index.js
+++ b/components/lib/themes/aura/multiselect/index.js
@@ -61,5 +61,8 @@ export default {
     },
     chip: {
         borderRadius: '{border.radius.sm}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/aura/select/index.js b/components/lib/themes/aura/select/index.js
index 28759d174..38bceb376 100644
--- a/components/lib/themes/aura/select/index.js
+++ b/components/lib/themes/aura/select/index.js
@@ -63,5 +63,8 @@ export default {
     },
     checkmark: {
         color: '{list.option.color}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/lara/autocomplete/index.js b/components/lib/themes/lara/autocomplete/index.js
index f34d41aab..bf7a6388b 100644
--- a/components/lib/themes/lara/autocomplete/index.js
+++ b/components/lib/themes/lara/autocomplete/index.js
@@ -28,7 +28,7 @@ export default {
         borderColor: '{overlay.select.border.color}',
         borderRadius: '{overlay.select.border.radius}',
         color: '{overlay.select.color}',
-        shadow: '{overlay.select.shadow}',
+        shadow: '{overlay.select.shadow}'
     },
     list: {
         padding: '{list.padding}',
@@ -65,5 +65,8 @@ export default {
     },
     chip: {
         borderRadius: '{border.radius.xs}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/lara/listbox/index.js b/components/lib/themes/lara/listbox/index.js
index b8b5c4e3e..a3d2512f8 100644
--- a/components/lib/themes/lara/listbox/index.js
+++ b/components/lib/themes/lara/listbox/index.js
@@ -41,5 +41,8 @@ export default {
         color: '{list.option.group.color}',
         fontWeight: '{list.option.group.font.weight}',
         padding: '{list.option.group.padding}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/lara/multiselect/index.js b/components/lib/themes/lara/multiselect/index.js
index fad5b783e..14891b1cc 100644
--- a/components/lib/themes/lara/multiselect/index.js
+++ b/components/lib/themes/lara/multiselect/index.js
@@ -63,5 +63,8 @@ export default {
     },
     chip: {
         borderRadius: '{border.radius.xs}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };
diff --git a/components/lib/themes/lara/select/index.js b/components/lib/themes/lara/select/index.js
index fd9a487d8..15cfaf8df 100644
--- a/components/lib/themes/lara/select/index.js
+++ b/components/lib/themes/lara/select/index.js
@@ -60,5 +60,8 @@ export default {
     },
     checkmark: {
         color: '{list.option.color}'
+    },
+    emptyMessage: {
+        padding: '{list.option.padding}'
     }
 };