diff --git a/src/components/ChecksTab.vue b/src/components/ChecksTab.vue
index 298a0db..29b6f0d 100644
--- a/src/components/ChecksTab.vue
+++ b/src/components/ChecksTab.vue
@@ -1,11 +1,11 @@
 <template>
-  <div v-if="checks.length === 0">No agent selected</div>
+  <div v-if="checks === null">No agent selected</div>
   <div class="row" v-else>
     <div class="col-12">
       <q-btn size="sm" color="grey-5" icon="fas fa-plus" label="Add Check" text-color="black">
         <q-menu>
           <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showDiskSpaceCheck = true">
+            <q-item clickable v-close-popup @click="showCheck('add', 'diskspace')">
               <q-item-section side>
                 <q-icon size="xs" name="far fa-hdd" />
               </q-item-section>
@@ -310,9 +310,7 @@ export default {
     return {
       mode: "add",
       showDiskSpaceCheck: false,
-      //
-      showAddDiskSpaceCheck: false,
-      showEditDiskSpaceCheck: false,
+      // refactor below
       showAddPingCheck: false,
       showEditPingCheck: false,
       showAddCpuLoadCheck: false,
@@ -358,9 +356,16 @@ export default {
   methods: {
     showCheck(mode, type) {
       if (mode === "add") {
+        this.mode = "add";
+        switch (type) {
+          case "diskspace":
+            this.showDiskSpaceCheck = true;
+            break;
+        }
+      } else if (mode === "edit") {
+        this.mode = "edit";
         switch (type) {
           case "diskspace":
-            this.mode = "add";
             this.showDiskSpaceCheck = true;
             break;
         }
diff --git a/src/store/store.js b/src/store/store.js
index 6cc5bd8..be25113 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -24,7 +24,7 @@ export const store = new Vuex.Store({
     selectedRow: null,
     agentSummary: {},
     winUpdates: {},
-    agentChecks: [],
+    agentChecks: null,
     automatedTasks: {},
     agentTableLoading: false,
     treeLoading: false,
@@ -110,7 +110,7 @@ export const store = new Vuex.Store({
     },
     destroySubTable(state) {
       (state.agentSummary = {}),
-        (state.agentChecks = []),
+        (state.agentChecks = null),
         (state.winUpdates = {});
       (state.installedSoftware = []);
       state.selectedRow = "";