diff --git a/modules/fontawesome_iconpicker_widget/src/IconManagerService.php b/modules/fontawesome_iconpicker_widget/src/IconManagerService.php
index ffcf8ff07bc59cde618831fefe2b667948a662e2..2b82990ff2d8d292d59a370af41de1112b009f22 100644
--- a/modules/fontawesome_iconpicker_widget/src/IconManagerService.php
+++ b/modules/fontawesome_iconpicker_widget/src/IconManagerService.php
@@ -196,8 +196,12 @@ class IconManagerService implements IconManagerServiceInterface {
     $terms_list = [];
     foreach ($icons as $properties) {
       foreach ($properties['classes'] as $item) {
-        array_push($properties['search_terms'], $properties['name']);
-        $terms_list[] = $properties['search_terms'];
+        $search_terms = $properties['search_terms'] ?? [];
+        if (!is_array($search_terms)) {
+          $search_terms = [];
+        }
+        $search_terms[] = $properties['name'];
+        $terms_list[] = $search_terms;
       }
     }
     return $terms_list;