Scottish Rugby director rugby, Scott Johnson said: "Greig [Laidlaw] has played a lot of rugby for both Edinburgh Rugby and Scotland this season and he's been a key figure in our leadership group.
"His time at Edinburgh has meant a great deal to him and he will have the opportunity to play again for Edinburgh this season.
"With the schedule as it stands looking ahead over the next 16 to 18 months, we're grateful to Edinburgh for supporting this move."
Edinburgh Rugby head coach Alan Solomons said: "The performance of the national team is of the utmost importance to the whole of Scottish Rugby, and this is will be a big year for Greig [Laidlaw].
"He has been a long-standing servant of this club and we are happy to support him and Scottish Rugby in this regard."
The extended rest period keeps the door open for Scotland A capped pair Grayson Hart (25) and Sean Kennedy (22), and Sam Hidalgo-Clyne (20), as the club looks forward to the seasons ahead.
Solmons added: "We have very capable, young Scottish scrum-halves who will compete for the number nine shirt next season, and will continue to get the opportunities they have handled admirably in Greig's absence during the RBS 6 Nations."