diff --git a/common/template_fieldnames.cpp b/common/template_fieldnames.cpp
index 044218dc80..cde557701e 100644
--- a/common/template_fieldnames.cpp
+++ b/common/template_fieldnames.cpp
@@ -134,7 +134,10 @@ void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel, bool aGlobal ) cons
     const TEMPLATE_FIELDNAMES& source = aGlobal ? m_globals : m_project;
 
     for( const TEMPLATE_FIELDNAME& temp : source )
-        temp.Format( out, nestLevel+1 );
+    {
+        if( !temp.m_Name.IsEmpty() )
+            temp.Format( out, nestLevel+1 );
+    }
 
     out->Print( 0, ")\n" );
 }
@@ -167,7 +170,8 @@ void TEMPLATES::parse( TEMPLATE_FIELDNAMES_LEXER* in, bool aGlobal )
                 field.Parse( in );
 
                 // add the field
-                AddTemplateFieldName( field, aGlobal );
+                if( !field.m_Name.IsEmpty() )
+                    AddTemplateFieldName( field, aGlobal );
             }
             break;
 
diff --git a/eeschema/dialogs/panel_template_fieldnames.cpp b/eeschema/dialogs/panel_template_fieldnames.cpp
index e1ae83c94a..46c435bc08 100644
--- a/eeschema/dialogs/panel_template_fieldnames.cpp
+++ b/eeschema/dialogs/panel_template_fieldnames.cpp
@@ -185,7 +185,10 @@ bool PANEL_TEMPLATE_FIELDNAMES::TransferDataFromWindow()
     m_templateMgr->DeleteAllFieldNameTemplates( m_global );
 
     for( const TEMPLATE_FIELDNAME& field : m_fields )
-        m_templateMgr->AddTemplateFieldName( field, m_global );
+    {
+        if( !field.m_Name.IsEmpty() )
+            m_templateMgr->AddTemplateFieldName( field, m_global );
+    }
 
     if( m_global )
     {