diff --git a/lib/services/db/queries.dart b/lib/services/db/queries.dart
index d5b018d..d81d187 100644
--- a/lib/services/db/queries.dart
+++ b/lib/services/db/queries.dart
@@ -43,7 +43,7 @@ Future<dynamic> editServerQuery(Database db, Server server) async {
           'port': server.port,
           'user': server.user,
           'password': server.password,
-          'defaultServer': server.defaultServer,
+          'defaultServer': convertFromBoolToInt(server.defaultServer),
           'authToken': server.authToken,
           'runningOnHa': convertFromBoolToInt(server.runningOnHa)
         },
diff --git a/lib/services/http_requests.dart b/lib/services/http_requests.dart
index 5507147..35b542f 100644
--- a/lib/services/http_requests.dart
+++ b/lib/services/http_requests.dart
@@ -274,7 +274,7 @@ Future getServerVersion(Server server) async {
     if (result['statusCode'] == 200 && result['body'] != null) {
       return {
         'result': 'success',
-        'data': result['body']['version']
+        'data': jsonDecode(result['body'])['version']
       };
     }
     else {
diff --git a/lib/widgets/add_server_modal.dart b/lib/widgets/add_server_modal.dart
index 4eba693..70ca410 100644
--- a/lib/widgets/add_server_modal.dart
+++ b/lib/widgets/add_server_modal.dart
@@ -377,7 +377,7 @@ class _AddServerModalState extends State<AddServerModal> {
         final serverSaved = await serversProvider.editServer(serverObj);
 
         if (serverSaved == null) {
-          final version = await getServerVersion(serverObj);;
+          final version = await getServerVersion(serverObj);
           if (
             version['result'] == 'success' && 
             (version['data'].contains('a') || version['data'].contains('b'))  // alpha or beta