diff --git a/receiver/FPGAAcquisitionDevice.cpp b/receiver/FPGAAcquisitionDevice.cpp
index 3bf17c71..91e6da78 100644
--- a/receiver/FPGAAcquisitionDevice.cpp
+++ b/receiver/FPGAAcquisitionDevice.cpp
@@ -162,9 +162,10 @@ inline void FIFO_check(JFJochProtoBuf::FPGAStatus &fpga_status,
 
     if (std::bitset<32>(fifo_register).test(pos_empty))
         fifo_status->set_value(JFJochProtoBuf::FPGAFIFOStatusEnum::EMPTY);
-    if (std::bitset<32>(fifo_register).test(pos_full))
+    else if (std::bitset<32>(fifo_register).test(pos_full))
         fifo_status->set_value(JFJochProtoBuf::FPGAFIFOStatusEnum::FULL);
-    fifo_status->set_value(JFJochProtoBuf::FPGAFIFOStatusEnum::PARTIAL);
+    else
+        fifo_status->set_value(JFJochProtoBuf::FPGAFIFOStatusEnum::PARTIAL);
 }
 
 inline void CheckHostWriterErr(JFJochProtoBuf::FPGAStatus &output, uint32_t status_register,