diff --git a/fairmq/sdk/commands/CMakeLists.txt b/fairmq/sdk/commands/CMakeLists.txt
index 6766e083..417c2c70 100644
--- a/fairmq/sdk/commands/CMakeLists.txt
+++ b/fairmq/sdk/commands/CMakeLists.txt
@@ -23,10 +23,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CommandsFormatDef.h.in ${CMAKE_CURREN
 add_library(${target} Commands.cxx Commands.h ${CMAKE_CURRENT_BINARY_DIR}/CommandsFormat.h ${CMAKE_CURRENT_BINARY_DIR}/CommandsFormatDef.h)
 add_library(FairMQ::${target} ALIAS ${target})
 
-# Some distros may not package the static library (e.g. Fedora), so we pick up the dynamic library instead
-set(_flatbuffers flatbuffers::flatbuffers)
-if(NOT TARGET flatbuffers::flatbuffers AND TARGET flatbuffers::flatbuffers_shared)
-  set(_flatbuffers flatbuffers::flatbuffers_shared)
+set(_flatbuffers flatbuffers::flatbuffers_shared)
+if(NOT TARGET flatbuffers::flatbuffers_shared AND TARGET flatbuffers::flatbuffers)
+  set(_flatbuffers flatbuffers::flatbuffers)
 endif()
 
 target_link_libraries(${target}