diff --git a/app/models/post.rb b/app/models/post.rb
index 2ef1d9817..e0f3e1d04 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -69,7 +69,7 @@ class Post < ApplicationRecord
 
     def keeper_id
       if PostKeeperManager.enabled?
-        keeper_data ? keeper_data["uid"] : uploader_id
+        (keeper_data && keeper_data["uid"]) ? keeper_data["uid"] : uploader_id
       else
         uploader_id
       end