Indeed the laws of Shemittah were meant to be given at Har Sinai because the original plan was that we would enter the land of Israel a short while later, not forty years later.