diff --git a/goneonize/main.go b/goneonize/main.go
index 530c47e..ba2b3bf 100644
--- a/goneonize/main.go
+++ b/goneonize/main.go
@@ -159,7 +159,7 @@ func Neonize(db *C.char, id *C.char, JIDByte *C.uchar, JIDSize C.int, logLevel *
 		}
 		deviceStore, err_device = container.GetDevice(utils.DecodeJidProto(&JID))
 	} else {
-		deviceStore, err_device = container.NewDevice(), nil
+		deviceStore, err_device = container.GetFirstDevice(), nil
 	}
 	if err_device != nil {
 		panic(err)