diff --git a/pcbnew/tools/drawing_stackup_table_tool.cpp b/pcbnew/tools/drawing_stackup_table_tool.cpp
index e1c3551f18..a488609645 100644
--- a/pcbnew/tools/drawing_stackup_table_tool.cpp
+++ b/pcbnew/tools/drawing_stackup_table_tool.cpp
@@ -295,6 +295,9 @@ std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawSpecificationStackup( const wxPoint&
 
     for( i = 0; i < stackup.GetCount(); i++ )
     {
+        if( !IsValidLayer( layers.at( i )->GetBrdLayerId() ) )
+            continue;
+
         for( j = 0; j < layers.at( i )->GetSublayersCount(); j++ )
         {
             // Layer names are empty until we close at least once the board setup dialog.