diff --git a/packages/dashmate/src/commands/config/set.js b/packages/dashmate/src/commands/config/set.js
index 80f984f7be0..7b12c92d744 100644
--- a/packages/dashmate/src/commands/config/set.js
+++ b/packages/dashmate/src/commands/config/set.js
@@ -15,15 +15,21 @@ class ConfigSetCommand extends ConfigBaseCommand {
     flags,
     config,
   ) {
-    if (optionValue === 'null') {
-      // eslint-disable-next-line no-param-reassign
-      optionValue = null;
+    // check for existence
+    config.get(optionPath);
+
+    let value;
+
+    try {
+      value = JSON.parse(optionValue);
+    } catch (e) {
+      value = optionValue;
     }
 
-    config.set(optionPath, optionValue);
+    config.set(optionPath, value);
 
     // eslint-disable-next-line no-console
-    console.log(`${optionPath} set to ${config.get(optionPath)}`);
+    console.log(`${optionPath} set to ${optionValue}`);
   }
 }
 
diff --git a/packages/dashmate/src/config/errors/InvalidOptionError.js b/packages/dashmate/src/config/errors/InvalidOptionError.js
index 77f8578708b..f1292b2eef3 100644
--- a/packages/dashmate/src/config/errors/InvalidOptionError.js
+++ b/packages/dashmate/src/config/errors/InvalidOptionError.js
@@ -1,6 +1,6 @@
 const AbstractError = require('../../errors/AbstractError');
 
-class InvalidOptionPathError extends AbstractError {
+class InvalidOptionError extends AbstractError {
   /**
    * @param {string} path
    * @param {*} value
@@ -37,4 +37,4 @@ class InvalidOptionPathError extends AbstractError {
   }
 }
 
-module.exports = InvalidOptionPathError;
+module.exports = InvalidOptionError;
diff --git a/packages/dashmate/test/unit/commands/config/set.spec.js b/packages/dashmate/test/unit/commands/config/set.spec.js
new file mode 100644
index 00000000000..6e95dc01309
--- /dev/null
+++ b/packages/dashmate/test/unit/commands/config/set.spec.js
@@ -0,0 +1,136 @@
+const ConfigSetCommand = require('../../../../src/commands/config/set');
+const Config = require('../../../../src/config/Config');
+const baseConfig = require('../../../../configs/system/base');
+
+describe('Config set command', () => {
+  const flags = {};
+  let config;
+
+  beforeEach(async () => {
+    config = new Config('config', baseConfig);
+  });
+
+  describe('#platform', () => {
+    it('should allow setting strings', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'core.docker.image', value: 'fake_image',
+      }, flags, config);
+    });
+
+    it('should allow setting null', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'description', value: null,
+      }, flags, config);
+
+      expect(config.get('description')).to.equal(null);
+
+      await command.runWithDependencies({
+        option: 'description', value: 'null',
+      }, flags, config);
+
+      expect(config.get('description')).to.equal(null);
+    });
+
+    it('should allow setting numbers', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'platform.drive.abci.validatorSet.llmqType',
+        value: 107,
+      }, flags, config);
+
+      expect(config.get('platform.drive.abci.validatorSet.llmqType')).to.equal(107);
+
+      await command.runWithDependencies({
+        option: 'platform.drive.abci.validatorSet.llmqType',
+        value: '107',
+      }, flags, config);
+
+      expect(config.get('platform.drive.abci.validatorSet.llmqType')).to.equal(107);
+    });
+
+    it('should allow setting booleans', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'dashmate.helper.api.enable', value: 'true',
+      }, flags, config);
+
+      expect(config.get('dashmate.helper.api.enable')).to.equal(true);
+
+      await command.runWithDependencies({
+        option: 'dashmate.helper.api.enable', value: true,
+      }, flags, config);
+
+      expect(config.get('dashmate.helper.api.enable')).to.equal(true);
+    });
+
+    it('should allow setting array of values', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'core.rpc.allowIps', value: '["1337", "36484"]',
+      }, flags, config);
+
+      expect(config.get('core.rpc.allowIps')).to.deep.equal(['1337', '36484']);
+    });
+
+    it('should allow replacing part of the json', async () => {
+      const command = new ConfigSetCommand();
+
+      await command.runWithDependencies({
+        option: 'docker',
+        value: '{"network":{"subnet":"127.0.0.1/24"}}',
+      }, flags, config);
+    });
+
+    it('should throw on unknown path', async () => {
+      const command = new ConfigSetCommand();
+
+      // invalid path
+      try {
+        await command.runWithDependencies({
+          option: 'fakePath', value: 'fake',
+        }, flags, config);
+
+        expect.fail('should throw error');
+      } catch (e) {
+        expect(e.name).to.equal('InvalidOptionPathError');
+      }
+    });
+
+    it('should throw if invalid json is passed', async () => {
+      const command = new ConfigSetCommand();
+
+      // invalid json
+      try {
+        await command.runWithDependencies({
+          option: 'core.rpc.allowIps', value: 'fake_image',
+        }, flags, config);
+
+        expect.fail('should throw error');
+      } catch (e) {
+        expect(e.name).to.equal('InvalidOptionError');
+      }
+    });
+
+    it('should throw on type mismatch', async () => {
+      const command = new ConfigSetCommand();
+
+      // invalid json
+      try {
+        await command.runWithDependencies({
+          option: 'dashmate.helper.api.enable', value: 120,
+        }, flags, config);
+
+        expect.fail('should throw error');
+      } catch (e) {
+        expect(e.name).to.equal('InvalidOptionError');
+      }
+    });
+  });
+});