diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp
index 576c9fb4..427aeb89 100644
--- a/src/ebusd/main.cpp
+++ b/src/ebusd/main.cpp
@@ -369,14 +369,18 @@ int main(int argc, char* argv[], char* envp[]) {
       } else {
         logNotice(lf_main, "configuration dump:");
       }
-      *out << "{\"datatypes\":[";
-      DataTypeList::getInstance()->dump(s_opt.dumpConfig, true, out);
-      *out << "],\"templates\":[";
-      const auto tmpl = s_scanHelper->getTemplates("");
-      tmpl->dump(s_opt.dumpConfig, out);
-      *out << "],\"messages\":";
-      s_messageMap->dump(true, s_opt.dumpConfig, out);
-      *out << "}";
+      if (s_opt.dumpConfig & OF_JSON) {
+        *out << "{\"datatypes\":[";
+        DataTypeList::getInstance()->dump(s_opt.dumpConfig, true, out);
+        *out << "],\"templates\":[";
+        const auto tmpl = s_scanHelper->getTemplates("");
+        tmpl->dump(s_opt.dumpConfig, out);
+        *out << "],\"messages\":";
+        s_messageMap->dump(true, s_opt.dumpConfig, out);
+        *out << "}";
+      } else {
+        s_messageMap->dump(true, s_opt.dumpConfig, out);
+      }
       if (fout.is_open()) {
         fout.close();
       }