diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 8cd38f7..12cf85a 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     'name': 'Improved Field Service Management',
-    'version': '15.0.1.0.7',
+    'version': '15.0.1.0.8',
     'summary': 'Adds functionality necessary for managing field service operations at Durpro.',
     'description': 'Adds functionality necessary for managing field service operations at Durpro.',
     'category': 'Services/Field Service',
diff --git a/bemade_fsm/models/equipment.py b/bemade_fsm/models/equipment.py
index dc08495..24587ab 100644
--- a/bemade_fsm/models/equipment.py
+++ b/bemade_fsm/models/equipment.py
@@ -72,4 +72,5 @@ class Equipment(models.Model):
     def _compute_complete_name(self):
         for rec in self:
             tag_part = "[%s] " % rec.pid_tag if rec.pid_tag else ""
-            rec.complete_name = tag_part + rec.name
+            name = rec.name or ""
+            rec.complete_name = tag_part + name
diff --git a/bemade_fsm/tests/test_equipment.py b/bemade_fsm/tests/test_equipment.py
index 16e06e2..879f129 100644
--- a/bemade_fsm/tests/test_equipment.py
+++ b/bemade_fsm/tests/test_equipment.py
@@ -19,3 +19,7 @@ class TestEquipment(BemadeFSMBaseTest):
         partner_company.write({'equipment_ids': [Command.set([])]})
         with self.assertRaises(MissingError):
             equipment.name
+
+    def test_compute_complete_name_when_name_blank(self):
+        equipment = self._generate_equipment(name=False)
+        complete_name = equipment.complete_name