diff --git a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
index 4722a2c6..ed288eb2 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
+++ b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
@@ -660,7 +660,7 @@ namespace skyline::service::hosbinder {
             }
 
             case TransactionCode::CancelBuffer: {
-                CancelBuffer(in.Pop<i32>(), in.Pop<AndroidFence>());
+                CancelBuffer(in.Pop<i32>(), in.PopFlattenable<AndroidFence>());
                 break;
             }
 
diff --git a/app/src/main/cpp/skyline/services/hosbinder/parcel.h b/app/src/main/cpp/skyline/services/hosbinder/parcel.h
index ade71b28..af76ade7 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/parcel.h
+++ b/app/src/main/cpp/skyline/services/hosbinder/parcel.h
@@ -49,20 +49,27 @@ namespace skyline::service::hosbinder {
             return value;
         }
 
+        /**
+         * @return A reference to an item from the top of data
+         */
+        template<typename ValueType>
+        ValueType &PopFlattenable() {
+            auto size{Pop<u64>()};
+            if (size != sizeof(ValueType))
+                throw exception("Popping flattenable of size 0x{:X} with type size 0x{:X}", size, sizeof(ValueType));
+            return Pop<ValueType>();
+        }
+
         /**
          * @return A pointer to an optional flattenable from the top of data, nullptr will be returned if the object doesn't exist
          */
         template<typename ValueType>
         ValueType *PopOptionalFlattenable() {
             bool hasObject{Pop<u32>() != 0};
-            if (hasObject) {
-                auto size{Pop<u64>()};
-                if (size != sizeof(ValueType))
-                    throw exception("Popping flattenable of size 0x{:X} with type size 0x{:X}", size, sizeof(ValueType));
-                return &Pop<ValueType>();
-            } else {
+            if (hasObject)
+                return &PopFlattenable<ValueType>();
+            else
                 return nullptr;
-            }
         }
 
         template<typename ValueType>