diff --git a/packages/gatsby-plugin-image/src/components/hooks.ts b/packages/gatsby-plugin-image/src/components/hooks.ts
index ce2bd9c5f99fd..038823ce15f97 100644
--- a/packages/gatsby-plugin-image/src/components/hooks.ts
+++ b/packages/gatsby-plugin-image/src/components/hooks.ts
@@ -27,8 +27,8 @@ export type IGatsbyImageDataParent<T = never> = T & {
 export type IGatsbyImageParent<T = never> = T & {
   gatsbyImage: IGatsbyImageData
 }
-export type FileNode = Node & {
-  childImageSharp?: IGatsbyImageDataParent<Node>
+export type FileNode = Partial<Node> & {
+  childImageSharp?: IGatsbyImageDataParent<Partial<Node>>
 }
 
 const isGatsbyImageData = (
@@ -54,7 +54,10 @@ export type ImageDataLike =
   | IGatsbyImageParent
   | IGatsbyImageData
 
-export const getImage = (node: ImageDataLike): IGatsbyImageData | undefined => {
+export const getImage = (
+  node: ImageDataLike | null
+): IGatsbyImageData | undefined => {
+  // This checks both for gatsbyImageData and gatsbyImage
   if (isGatsbyImageData(node)) {
     return node
   }