diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
index 28c4f1e9c6..75ef832483 100644
--- a/libmscore/edit.cpp
+++ b/libmscore/edit.cpp
@@ -2702,7 +2702,7 @@ void Score::insertMeasure(ElementType type, MeasureBase* measure, bool createEmp
                                           }
                                     }
                               for (Segment* s = mi->first(); s && s->rtick() == 0; s = s->next()) {
-                                    if (s->isHeaderClefType() || !s->enabled())
+                                    if (!s->enabled())
                                           continue;
                                     Element* e = s->element(staffIdx * VOICES);
                                     if (!e)
@@ -2750,7 +2750,7 @@ void Score::insertMeasure(ElementType type, MeasureBase* measure, bool createEmp
                         }
                   for (Clef* clef : cl) {
                         Clef* nClef = new Clef(*clef);
-                        Segment* s  = m->undoGetSegmentR(SegmentType::Clef, 0);
+                        Segment* s  = m->undoGetSegmentR(SegmentType::HeaderClef, 0);
                         nClef->setParent(s);
                         undoAddElement(nClef);
                         }
diff --git a/mtest/libmscore/measure/measure-2-ref.mscx b/mtest/libmscore/measure/measure-2-ref.mscx
index 93d887dd23..51bbbc1032 100644
--- a/mtest/libmscore/measure/measure-2-ref.mscx
+++ b/mtest/libmscore/measure/measure-2-ref.mscx
@@ -113,6 +113,10 @@
         </VBox>
       <Measure>
         <voice>
+          <Clef>
+            <concertClefType>G</concertClefType>
+            <transposingClefType>G</transposingClefType>
+            </Clef>
           <TimeSig>
             <sigN>2</sigN>
             <sigD>4</sigD>
@@ -126,10 +130,6 @@
         </Measure>
       <Measure>
         <voice>
-          <Clef>
-            <concertClefType>G</concertClefType>
-            <transposingClefType>G</transposingClefType>
-            </Clef>
           <Tempo>
             <tempo>1.66667</tempo>
             <text>𝅘𝅥 = 100</text>
@@ -211,6 +211,10 @@
     <Staff id="2">
       <Measure>
         <voice>
+          <Clef>
+            <concertClefType>F</concertClefType>
+            <transposingClefType>F</transposingClefType>
+            </Clef>
           <TimeSig>
             <sigN>2</sigN>
             <sigD>4</sigD>
@@ -224,10 +228,6 @@
         </Measure>
       <Measure>
         <voice>
-          <Clef>
-            <concertClefType>F</concertClefType>
-            <transposingClefType>F</transposingClefType>
-            </Clef>
           <Rest>
             <linkedMain/>
             <durationType>measure</durationType>
@@ -266,6 +266,10 @@
     <Staff id="3">
       <Measure>
         <voice>
+          <Clef>
+            <concertClefType>G</concertClefType>
+            <transposingClefType>G</transposingClefType>
+            </Clef>
           <TimeSig>
             <sigN>2</sigN>
             <sigD>4</sigD>
@@ -279,10 +283,6 @@
         </Measure>
       <Measure>
         <voice>
-          <Clef>
-            <concertClefType>G</concertClefType>
-            <transposingClefType>G</transposingClefType>
-            </Clef>
           <Rest>
             <linkedMain/>
             <durationType>measure</durationType>
@@ -398,6 +398,10 @@
           </VBox>
         <Measure>
           <voice>
+            <Clef>
+              <concertClefType>G</concertClefType>
+              <transposingClefType>G</transposingClefType>
+              </Clef>
             <TimeSig>
               <sigN>2</sigN>
               <sigD>4</sigD>
@@ -413,10 +417,6 @@
         <Measure>
           <breakMultiMeasureRest>1</breakMultiMeasureRest>
           <voice>
-            <Clef>
-              <concertClefType>G</concertClefType>
-              <transposingClefType>G</transposingClefType>
-              </Clef>
             <Tempo>
               <tempo>1.66667</tempo>
               <text>𝅘𝅥 = 100</text>
@@ -511,6 +511,10 @@
       <Staff id="2">
         <Measure>
           <voice>
+            <Clef>
+              <concertClefType>G</concertClefType>
+              <transposingClefType>G</transposingClefType>
+              </Clef>
             <TimeSig>
               <sigN>2</sigN>
               <sigD>4</sigD>
@@ -525,10 +529,6 @@
           </Measure>
         <Measure>
           <voice>
-            <Clef>
-              <concertClefType>G</concertClefType>
-              <transposingClefType>G</transposingClefType>
-              </Clef>
             <Rest>
               <linked>
                 </linked>
@@ -642,6 +642,10 @@
           </VBox>
         <Measure>
           <voice>
+            <Clef>
+              <concertClefType>G</concertClefType>
+              <transposingClefType>G</transposingClefType>
+              </Clef>
             <TimeSig>
               <sigN>2</sigN>
               <sigD>4</sigD>
@@ -657,10 +661,6 @@
         <Measure>
           <breakMultiMeasureRest>1</breakMultiMeasureRest>
           <voice>
-            <Clef>
-              <concertClefType>G</concertClefType>
-              <transposingClefType>G</transposingClefType>
-              </Clef>
             <Tempo>
               <tempo>1.66667</tempo>
               <linkedMain/>
diff --git a/mtest/libmscore/measure/measure-5-ref.mscx b/mtest/libmscore/measure/measure-5-ref.mscx
index 7bb33aa8e0..3ad4097bf0 100644
--- a/mtest/libmscore/measure/measure-5-ref.mscx
+++ b/mtest/libmscore/measure/measure-5-ref.mscx
@@ -57,6 +57,10 @@
     <Staff id="1">
       <Measure>
         <voice>
+          <Clef>
+            <concertClefType>G</concertClefType>
+            <transposingClefType>G</transposingClefType>
+            </Clef>
           <TimeSig>
             <sigN>4</sigN>
             <sigD>4</sigD>
@@ -69,10 +73,6 @@
         </Measure>
       <Measure>
         <voice>
-          <Clef>
-            <concertClefType>G</concertClefType>
-            <transposingClefType>G</transposingClefType>
-            </Clef>
           <Chord>
             <durationType>quarter</durationType>
             <Note>