diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index a9f75615..795e1a47 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -1290,9 +1290,9 @@ createMmsModelFromIedModel(MmsMapping* self, IedModel* iedModel)
 {
     MmsDevice* mmsDevice = NULL;
 
-    if (iedModel->firstChild != NULL) {
+    mmsDevice = MmsDevice_create(iedModel->name);
 
-        mmsDevice = MmsDevice_create(iedModel->name);
+    if (iedModel->firstChild != NULL) {
 
         int iedDeviceCount = IedModel_getLogicalDeviceCount(iedModel);