diff --git a/management/server/account_test.go b/management/server/account_test.go
index 760118cbd..8150d5bc7 100644
--- a/management/server/account_test.go
+++ b/management/server/account_test.go
@@ -3,7 +3,7 @@ package server
 import (
 	"fmt"
 	nbdns "github.com/netbirdio/netbird/dns"
-	"github.com/netbirdio/netbird/management/server/activity"
+	activity "github.com/netbirdio/netbird/management/server/activity/sqlite"
 	"github.com/netbirdio/netbird/route"
 	"net"
 	"reflect"
diff --git a/management/server/activity/event.go b/management/server/activity/event.go
index d92698863..b80be9d05 100644
--- a/management/server/activity/event.go
+++ b/management/server/activity/event.go
@@ -165,6 +165,26 @@ type Store interface {
 	Close() error
 }
 
+// NoopEventStore implements the Store interface without doing any operations
+type NoopEventStore struct {
+}
+
+// Save sets the Event.ID to 1
+func (store *NoopEventStore) Save(event *Event) (*Event, error) {
+	event.ID = 1
+	return event, nil
+}
+
+// Get returns an empty list of events
+func (store *NoopEventStore) Get(accountID string, offset, limit int, descending bool) ([]*Event, error) {
+	return []*Event{}, nil
+}
+
+// Close doesn't close anything
+func (store *NoopEventStore) Close() error {
+	return nil
+}
+
 // Event represents a network/system activity event.
 type Event struct {
 	// Timestamp of the event
diff --git a/management/server/activity/mock.go b/management/server/activity/mock.go
index 83f44c84c..660931070 100644
--- a/management/server/activity/mock.go
+++ b/management/server/activity/mock.go
@@ -1,17 +1 @@
 package activity
-
-type NoopEventStore struct {
-}
-
-func (store *NoopEventStore) Save(event *Event) (*Event, error) {
-	event.ID = 1
-	return event, nil
-}
-
-func (store *NoopEventStore) Get(accountID string, offset, limit int, descending bool) ([]*Event, error) {
-	return []*Event{}, nil
-}
-
-func (store *NoopEventStore) Close() error {
-	return nil
-}
diff --git a/management/server/management_proto_test.go b/management/server/management_proto_test.go
index bace763fd..426ce4b91 100644
--- a/management/server/management_proto_test.go
+++ b/management/server/management_proto_test.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 	"fmt"
-	"github.com/netbirdio/netbird/management/server/activity"
+	activity "github.com/netbirdio/netbird/management/server/activity/sqlite"
 	"net"
 	"os"
 	"path/filepath"
diff --git a/management/server/management_test.go b/management/server/management_test.go
index 093afcc18..25a48fad3 100644
--- a/management/server/management_test.go
+++ b/management/server/management_test.go
@@ -2,7 +2,7 @@ package server_test
 
 import (
 	"context"
-	"github.com/netbirdio/netbird/management/server/activity"
+	activity "github.com/netbirdio/netbird/management/server/activity/sqlite"
 	"math/rand"
 	"net"
 	"os"
diff --git a/management/server/nameserver_test.go b/management/server/nameserver_test.go
index b419080af..5f3c91c87 100644
--- a/management/server/nameserver_test.go
+++ b/management/server/nameserver_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	nbdns "github.com/netbirdio/netbird/dns"
-	"github.com/netbirdio/netbird/management/server/activity"
+	activity "github.com/netbirdio/netbird/management/server/activity/sqlite"
 	"github.com/stretchr/testify/require"
 	"net/netip"
 	"testing"
diff --git a/management/server/route_test.go b/management/server/route_test.go
index 2468a6604..6447cfb39 100644
--- a/management/server/route_test.go
+++ b/management/server/route_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/netbirdio/netbird/management/server/activity"
+	activity "github.com/netbirdio/netbird/management/server/activity/sqlite"
 	"github.com/netbirdio/netbird/route"
 	"github.com/rs/xid"
 	"github.com/stretchr/testify/require"