diff --git a/satellite/src/main/java/com/linbit/linstor/layer/drbd/DrbdLayer.java b/satellite/src/main/java/com/linbit/linstor/layer/drbd/DrbdLayer.java
index 31d9b5c56..e0e4bd613 100644
--- a/satellite/src/main/java/com/linbit/linstor/layer/drbd/DrbdLayer.java
+++ b/satellite/src/main/java/com/linbit/linstor/layer/drbd/DrbdLayer.java
@@ -1770,7 +1770,6 @@ private void condInitialOrSkipSync(DrbdRscData<Resource> drbdRscData)
 
                 // Set the resource primary (--force) to trigger an initial sync of all
                 // fat provisioned volumes
-                rsc.unsetCreatePrimary();
                 if (haveFatVlm)
                 {
                     errorReporter.logTrace("Setting resource primary on %s", drbdRscData.getSuffixedResourceName());
@@ -1795,6 +1794,7 @@ private void condInitialOrSkipSync(DrbdRscData<Resource> drbdRscData)
                         throw new StorageException("Failed to become secondary again after creating filesystem", exc);
                     }
                 }
+                rsc.unsetCreatePrimary();
             }
         }
         catch (InvalidKeyException invalidKeyExc)
diff --git a/server/src/main/java/com/linbit/linstor/storage/utils/MkfsUtils.java b/server/src/main/java/com/linbit/linstor/storage/utils/MkfsUtils.java
index d23ec534d..f9ad9c228 100644
--- a/server/src/main/java/com/linbit/linstor/storage/utils/MkfsUtils.java
+++ b/server/src/main/java/com/linbit/linstor/storage/utils/MkfsUtils.java
@@ -133,7 +133,6 @@ public static void makeFileSystemOnMarked(
     {
         if (rsc.getLayerData(wrkCtx).checkFileSystem())
         {
-            rsc.getLayerData(wrkCtx).disableCheckFileSystem();
             for (AbsVolume<Resource> vlm : rsc.streamVolumes().collect(Collectors.toList()))
             {
                 VolumeDefinition vlmDfn = vlm.getVolumeDefinition();
@@ -251,6 +250,7 @@ public static void makeFileSystemOnMarked(
                     // else Check for mismatch?
                 }
             }
+            rsc.getLayerData(wrkCtx).disableCheckFileSystem();
         }
     }