diff --git a/CMakeLists.txt b/CMakeLists.txt
index edb7b850..c8053cc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,8 +114,6 @@ else()
     list(APPEND LUAU_OPTIONS -Wall) # All warnings
     list(APPEND LUAU_OPTIONS -Wimplicit-fallthrough)
     list(APPEND LUAU_OPTIONS -Wsign-compare) # This looks to be included in -Wall for GCC but not clang
-    list(APPEND LUAU_OPTIONS -Wno-maybe-uninitialized)
-
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -126,8 +124,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Some gcc versions treat var in `if (type var = val)` as unused
     # Some gcc versions treat variables used in constexpr if blocks as unused
     list(APPEND LUAU_OPTIONS -Wno-unused)
-    # GCC has some bugs where we optional<string> is treated as uninitialized if it is on a structg
-
 endif()
 
 # Enabled in CI; we should be warning free on our main compiler versions but don't guarantee being warning free everywhere
diff --git a/Makefile b/Makefile
index cb199de8..1f082f38 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,10 @@ LDFLAGS=
 
 # some gcc versions treat var in `if (type var = val)` as unused
 # some gcc versions treat variables used in constexpr if blocks as unused
+# some gcc versions warn maybe uninitalized on optional<std::string> members on structs
 ifeq ($(findstring g++,$(shell $(CXX) --version)),g++)
 	CXXFLAGS+=-Wno-unused
+	CXXFLAGS+=-Wno-maybe-uninitialized
 endif
 
 # enabled in CI; we should be warning free on our main compiler versions but don't guarantee being warning free everywhere