diff --git a/eeschema/sim/sim_model_subckt.cpp b/eeschema/sim/sim_model_subckt.cpp
index 89cf407f81..5fc4571499 100644
--- a/eeschema/sim/sim_model_subckt.cpp
+++ b/eeschema/sim/sim_model_subckt.cpp
@@ -41,6 +41,7 @@ namespace SIM_MODEL_SUBCKT_SPICE_PARSER
     template <> struct spiceUnitSelector<dotSubcktPinName> : std::true_type {};
     template <> struct spiceUnitSelector<dotSubcktParams> : std::true_type {};
     template <> struct spiceUnitSelector<param> : std::true_type {};
+    template <> struct spiceUnitSelector<paramValue> : std::true_type {};
     template <> struct spiceUnitSelector<number<SIM_VALUE::TYPE_INT, NOTATION::SPICE>>
         : std::true_type {};
     template <> struct spiceUnitSelector<number<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>>
@@ -111,22 +112,17 @@ void SPICE_MODEL_PARSER_SUBCKT::ReadModel( const SIM_LIBRARY_SPICE& aLibrary,
 
                             model.AddParam( *model.m_paramInfos.back() );
                         }
+                        else if( subsubnode->is_type<SIM_MODEL_SUBCKT_SPICE_PARSER::paramValue>() )
+                        {
+                            wxASSERT( model.m_paramInfos.size() > 0 );
+                            model.m_paramInfos.back()->defaultValue = subsubnode->string();
+                        }
                         else
                         {
                             wxFAIL_MSG( "Unhandled parse tree subsubnode" );
                         }
                     }
                 }
-                else if( subnode->is_type<
-                        SIM_MODEL_SUBCKT_SPICE_PARSER::number<SIM_VALUE::TYPE_INT,
-                            SIM_MODEL_SUBCKT_SPICE_PARSER::NOTATION::SPICE>>()
-                    || subnode->is_type<
-                        SIM_MODEL_SUBCKT_SPICE_PARSER::number<SIM_VALUE::TYPE_FLOAT,
-                            SIM_MODEL_SUBCKT_SPICE_PARSER::NOTATION::SPICE>>() )
-                {
-                    wxASSERT( model.m_paramInfos.size() > 0 );
-                    model.m_paramInfos.back()->defaultValue = subnode->string();
-                }
             }
         }
         else
diff --git a/eeschema/sim/spice_grammar.h b/eeschema/sim/spice_grammar.h
index 2696eb9eec..1a7fcfee6a 100644
--- a/eeschema/sim/spice_grammar.h
+++ b/eeschema/sim/spice_grammar.h
@@ -110,7 +110,6 @@ namespace SPICE_GRAMMAR
     // Param names cannot be `token` because LTspice models contain spurious values without
     // parameter names, which we need to skip.
     struct param : identifier {};
-
     struct paramValue : token {};
 
     struct paramValuePair : seq<param,
@@ -145,12 +144,20 @@ namespace SPICE_GRAMMAR
                                      
 
 
-    struct dotSubcktPinName : seq<not_at<TAO_PEGTL_ISTRING( "params:" )>,
+    struct dotSubcktParamValuePair : seq<param,
+                                         // TODO: Check if these `star<space>`s match Ngspice's
+                                         // behavior.
+                                         star<space>,
+                                         one<'='>,
+                                         star<space>,
+                                         paramValue> {};
+    struct dotSubcktParamValuePairs : list<dotSubcktParamValuePair, sep> {};
+    struct dotSubcktParams : seq<opt<TAO_PEGTL_ISTRING( "params:" ),
+                                     opt<sep>>,
+                                 dotSubcktParamValuePairs> {};
+    struct dotSubcktPinName : seq<not_at<dotSubcktParams>,
                                   plus<not_at<space>, any>> {};
     struct dotSubcktPinSequence : list<dotSubcktPinName, sep> {};
-    struct dotSubcktParams : seq<TAO_PEGTL_ISTRING( "params:" ),
-                                 sep,
-                                 paramValuePairs> {};
     struct dotSubcktEnd : seq<TAO_PEGTL_ISTRING( ".ends" ),
                               until<newline>> {};
     struct spiceUnit;