diff --git a/services/terraform/modules/shared/dynamodb.tf b/services/terraform/modules/shared/dynamodb.tf
--- a/services/terraform/modules/shared/dynamodb.tf
+++ b/services/terraform/modules/shared/dynamodb.tf
@@ -80,9 +80,6 @@
 }
 
 resource "aws_dynamodb_table" "tunnelbroker-undelivered-messages" {
-  # This table doesnt exist in prod
-  count = var.is_dev ? 1 : 0
-
   name         = "tunnelbroker-undelivered-messages"
   hash_key     = "deviceID"
   range_key    = "createdAt"
diff --git a/services/terraform/modules/shared/outputs.tf b/services/terraform/modules/shared/outputs.tf
--- a/services/terraform/modules/shared/outputs.tf
+++ b/services/terraform/modules/shared/outputs.tf
@@ -3,6 +3,7 @@
     aws_dynamodb_table.feature-flags,
     aws_dynamodb_table.backup-service-backup,
     aws_dynamodb_table.reports-service-reports,
+    aws_dynamodb_table.tunnelbroker-undelivered-messages,
   ]
 }