diff --git a/ud/channelIDTracking.go b/ud/channelIDTracking.go
index 113c4a149b75bab965eeefb48cd52c16447b3588..a1546acc28a3936e2336395600708a602f4c4d47 100644
--- a/ud/channelIDTracking.go
+++ b/ud/channelIDTracking.go
@@ -203,10 +203,12 @@ func (c *clientIDTracker) Start() (stoppable.Stoppable, error) {
 }
 
 func (c *clientIDTracker) registrationWorker(stopper *stoppable.Single) {
-
 	for {
 		if time.Now().After(c.registrationDisk.GetLease().Add(-graceDuration)) {
-			c.register()
+			err := c.register()
+			if err != nil {
+				jww.FATAL.Panic(err)
+			}
 		}
 
 		select {
@@ -221,7 +223,6 @@ func (c *clientIDTracker) registrationWorker(stopper *stoppable.Single) {
 			return
 		case <-time.After(time.Second):
 		}
-
 	}
 }
 
diff --git a/ud/channelIDTracking_test.go b/ud/channelIDTracking_test.go
index 5e8c5e11da6e60622e398c2bcd4e82492e3baeab..c8b516e0009bc9698bd98f355e5f39b861f8a4c0 100644
--- a/ud/channelIDTracking_test.go
+++ b/ud/channelIDTracking_test.go
@@ -71,7 +71,10 @@ func TestChannelIDTracking(t *testing.T) {
 	myTestClientIDTracker := newclientIDTracker(comms, host, username,
 		kv, m.user.GetReceptionIdentity(), ed25519.PublicKey(udPubKeyBytes), rngGen)
 
-	stopper, err := myTestClientIDTracker.Start()
+	//stopper, err := myTestClientIDTracker.Start()
+	//require.NoError(t, err)
+
+	err = myTestClientIDTracker.register()
 	require.NoError(t, err)
 
 	require.Equal(t, myTestClientIDTracker.GetUsername(), username)
@@ -90,6 +93,6 @@ func TestChannelIDTracking(t *testing.T) {
 
 	//_ = myTestClientIDTracker.ValidateChannelMessage(username, lease, pubKey, authorIDSignature)
 
-	err = stopper.Close()
-	require.NoError(t, err)
+	//err = stopper.Close()
+	//require.NoError(t, err)
 }