diff --git a/kong/clustering/services/sync/rpc.lua b/kong/clustering/services/sync/rpc.lua
index 70ff0c76615f..52fff5c1a795 100644
--- a/kong/clustering/services/sync/rpc.lua
+++ b/kong/clustering/services/sync/rpc.lua
@@ -88,12 +88,12 @@ function _M:init_cp(manager)
     end
 
     local latest_version, err = self.strategy:get_latest_version()
-    if latest_version == nil or latest_version == ngx_null then
+    if latest_version == nil then
       return nil, err
     end
 
     -- is the node empty? If so, just do a full sync to bring it up to date faster
-    if default_namespace_version == 0 or
+    if default_namespace_version == 0 or latest_version == ngx_null or
        latest_version - default_namespace_version > FULL_SYNC_THRESHOLD
     then
       -- we need to full sync because holes are found