diff --git a/storage/store/memory/memory.go b/storage/store/memory/memory.go
index ee226b95..e180a01b 100644
--- a/storage/store/memory/memory.go
+++ b/storage/store/memory/memory.go
@@ -2,6 +2,7 @@ package memory
 
 import (
 	"encoding/gob"
+	"sort"
 	"sync"
 	"time"
 
@@ -53,6 +54,9 @@ func (s *Store) GetAllServiceStatuses(params *paging.ServiceStatusParams) []*cor
 	for _, v := range serviceStatuses {
 		pagedServiceStatuses = append(pagedServiceStatuses, ShallowCopyServiceStatus(v.(*core.ServiceStatus), params))
 	}
+	sort.Slice(pagedServiceStatuses, func(i, j int) bool {
+		return pagedServiceStatuses[i].Key < pagedServiceStatuses[j].Key
+	})
 	return pagedServiceStatuses
 }
 
diff --git a/storage/store/memory/memory_test.go b/storage/store/memory/memory_test.go
index e3cd9413..fab4d1de 100644
--- a/storage/store/memory/memory_test.go
+++ b/storage/store/memory/memory_test.go
@@ -24,7 +24,6 @@ var (
 		Interval:                30 * time.Second,
 		Conditions:              []*core.Condition{&firstCondition, &secondCondition, &thirdCondition},
 		Alerts:                  nil,
-		Insecure:                false,
 		NumberOfFailuresInARow:  0,
 		NumberOfSuccessesInARow: 0,
 	}
diff --git a/storage/store/sqlite/sqlite.go b/storage/store/sqlite/sqlite.go
index 9e2c6376..b7c60a05 100644
--- a/storage/store/sqlite/sqlite.go
+++ b/storage/store/sqlite/sqlite.go
@@ -522,7 +522,7 @@ func (s *Store) updateServiceUptime(tx *sql.Tx, serviceID int64, result *core.Re
 }
 
 func (s *Store) getAllServiceKeys(tx *sql.Tx) (keys []string, err error) {
-	rows, err := tx.Query("SELECT service_key FROM service")
+	rows, err := tx.Query("SELECT service_key FROM service ORDER BY service_key")
 	if err != nil {
 		return nil, err
 	}
diff --git a/storage/store/sqlite/sqlite_test.go b/storage/store/sqlite/sqlite_test.go
index a58cf5fb..91a2fc69 100644
--- a/storage/store/sqlite/sqlite_test.go
+++ b/storage/store/sqlite/sqlite_test.go
@@ -25,7 +25,6 @@ var (
 		Interval:                30 * time.Second,
 		Conditions:              []*core.Condition{&firstCondition, &secondCondition, &thirdCondition},
 		Alerts:                  nil,
-		Insecure:                false,
 		NumberOfFailuresInARow:  0,
 		NumberOfSuccessesInARow: 0,
 	}
diff --git a/storage/store/store_test.go b/storage/store/store_test.go
index 622ce7c2..c863ed02 100644
--- a/storage/store/store_test.go
+++ b/storage/store/store_test.go
@@ -27,7 +27,6 @@ var (
 		Interval:                30 * time.Second,
 		Conditions:              []*core.Condition{&firstCondition, &secondCondition, &thirdCondition},
 		Alerts:                  nil,
-		Insecure:                false,
 		NumberOfFailuresInARow:  0,
 		NumberOfSuccessesInARow: 0,
 	}