diff --git a/pkg/services/store/resource/sqlstash/data/resource_get.sql b/pkg/services/store/resource/sqlstash/data/resource_get.sql
index 03e51b057a9..6da2184d37e 100644
--- a/pkg/services/store/resource/sqlstash/data/resource_get.sql
+++ b/pkg/services/store/resource/sqlstash/data/resource_get.sql
@@ -25,13 +25,10 @@ FROM "resource"
         name), so we're guaranteed to have at most one matching row.
       */}}
       {{ if gt .ResourceVersion 0 }}
-            AND {{ .Ident "rv" }} <= {{ .Arg .ResourceVersion }}
-
+          AND {{ .Ident "rv" }} <= {{ .Arg .ResourceVersion }}
           ORDER BY {{ .Ident "rv" }} DESC
           LIMIT 1
+      {{ else }}
+          AND {{ .Ident "is_current" }} = true
       {{ end }}
-
-      {{ if .SelectForUpdate }}
-          {{ .SelectFor "UPDATE NOWAIT" }}
-      {{ end }}
-;
+;
\ No newline at end of file