diff --git a/src/Val.cc b/src/Val.cc
index 5f5276fb0d..56f4c15009 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -2192,7 +2192,10 @@ void TableVal::SendToStore(const Val* index, const TableEntryVal* new_entry_val,
 			case ELEMENT_NEW:
 			case ELEMENT_CHANGED:
 				{
+				#pragma GCC diagnostic push
+				#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 				broker::optional<broker::timespan> expiry;
+				#pragma GCC diagnostic pop
 
 				auto expire_time = GetExpireTime();
 				if ( expire_time == 0 )